projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4c17631
)
Update for Libxml2-2.6.15, zlib-1.2.1
author
Adam Dickmeiss
<adam@indexdata.dk>
Sun, 16 Jan 2005 00:16:56 +0000
(
00:16
+0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Sun, 16 Jan 2005 00:16:56 +0000
(
00:16
+0000)
win/makefile
patch
|
blob
|
history
diff --git
a/win/makefile
b/win/makefile
index
6c6ab3f
..
7378184
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-1,9
+1,9
@@
-# Copyright (C) 1994-2005, Index Data
+# Copyright (C) 1994-2005, Index Data ApS
# All rights reserved.
# All rights reserved.
-# $Id: makefile,v 1.88 2005-01-11 12:13:18 adam Exp $
+# $Id: makefile,v 1.89 2005-01-16 00:16:56 adam Exp $
#
# Programmed by
#
# Programmed by
-# HL: Heikki Levanto, Index Data
+# Heikki Levanto & Adam Dickmeiss
###########################################################
############### Parameters
###########################################################
############### Parameters
@@
-22,13
+22,13
@@
ICONV_DIR = c:\iconv-1.9.1.win32
# libxml2
HAVE_LIBXML2=1
# libxml2
HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.9.win32
+LIBXML2_DIR=c:\libxml2-2.6.15.win32
# zlib compression (used by libxml2)
# zlib compression (used by libxml2)
-ZLIB_DIR = c:\zlib-1.1.4.win32
+ZLIB_DIR = c:\zlib-1.2.1.win32
# get WIN32 binaries libxml2 & iconv & zlib from here:
# get WIN32 binaries libxml2 & iconv & zlib from here:
-# http://www.zlatkovic.com/projects/libxml/binaries.html
+# http://www.zlatkovic.com/libxml.en.html
# bison
HAVE_BISON=1
# bison
HAVE_BISON=1
@@
-146,13
+146,13
@@
iconv:
!if $(HAVE_LIBXML2)
LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
!if $(HAVE_LIBXML2)
LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
-libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib.dll
+libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
$(BINDIR)\libxml2.dll:
$(BINDIR)\libxml2.dll:
- copy "$(LIBXML2_DIR)\lib\libxml2.dll" $(BINDIR)
+ copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
-$(BINDIR)\zlib.dll:
- copy "$(ZLIB_DIR)\lib\zlib.dll" $(BINDIR)
+$(BINDIR)\zlib1.dll:
+ copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
!else
LIBXML2_LIB=
!else
LIBXML2_LIB=