X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=fab1fe84f69c20e1a8ec71924edee74add428b22;hp=0664be3e08e141b00b3563f82959df4ea3dfb294;hb=HEAD;hpb=57a93b024ec8ceef959a59cd6a9b5137aef2dc09

diff --git a/win/makefile b/win/makefile
index 0664be3..fab1fe8 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,5 @@
-# Copyright (C) 1999-2006, Index Data ApS
+# Copyright (C) 1998-2011 Index Data
 # All rights reserved.
-# $Id: makefile,v 1.14 2008-02-21 10:16:51 adam Exp $
 
 ###########################################################
 ############### Parameters 
@@ -13,22 +12,16 @@ YAZ_DIR=..\..\yaz
 YAZPP_DIR=..\..\yazpp
 
 # iconv charcter conversion utility
-HAVE_ICONV=1
+HAVE_ICONV=0
 ICONV_DIR=\iconv-1.9.2.win32
 
 # libxslt
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=\libxslt-1.1.19.win32
+LIBXSLT_DIR=\libxslt-1.1.28.win32
 
 # libxml2 (used by libxslt)
 HAVE_LIBXML2=1
-LIBXML2_DIR=\libxml2-2.6.28.win32
-
-# zlib compression (used by libxml2)
-ZLIB_DIR=\zlib-1.2.3.win32
-
-# get WIN32 binaries for libxslt, libxml, iconv, zlib from here:
-# http://www.zlatkovic.com/libxml.en.html
+LIBXML2_DIR=\libxml2-2.9.2.win32
 
 default: all
 
@@ -73,11 +66,11 @@ dll: $(YAZPROXY_DLL)
 proxy: $(YAZPROXY)
 
 !if $(DEBUG)
-YAZD=yaz3d
-YAZPPD=yazpp3d
+YAZD=yaz5d
+YAZPPD=yazpp6d
 !else
-YAZD=yaz3
-YAZPPD=yazpp3
+YAZD=yaz5
+YAZPPD=yazpp6
 !endif
 
 # YAZ includes & libs
@@ -119,14 +112,10 @@ iconv:
 !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)\zlib1.dll
+libxml2: $(BINDIR)\libxml2.dll
 
 $(BINDIR)\libxml2.dll:
   copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
-
-$(BINDIR)\zlib1.dll:
-  copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
-
 !else
 LIBXML2_LIB=
 LIBXML2_DEF=/D HAVE_XML2=0
@@ -137,7 +126,7 @@ libxml2:
 !if $(HAVE_LIBXSLT)
 LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
 LIBXSLT_DEF=/D YAZ_HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
-libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib1.dll
+libxslt: $(BINDIR)\libxslt.dll
 
 $(BINDIR)\libxslt.dll:
   copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
@@ -199,15 +188,10 @@ RELEASE_C_OPTIONS=  \
 ### Linker options
 LINK=link.exe
 
-LINK_LIBS=kernel32.lib user32.lib gdi32.lib advapi32.lib uuid.lib \
-          wsock32.lib  advapi32.lib \
+LINK_LIBS=kernel32.lib advapi32.lib ws2_32.lib \
            $(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
 
-COMMON_LNK_OPTIONS=\
-		/nologo \
-		/subsystem:windows \
-		/machine:i386 \
-		/incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
 
 DEBUG_LNK_OPTIONS= /debug