X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=b094e4e927e4b7f88302f1d7352279da849513ee;hp=6ab11667c76dea5938197ec58b2fc7e0669bf52f;hb=82b0575e71269b113acb2bb7c7541a470ed07c9a;hpb=22afe38a1f113ef7f2a46d1fde0141cf10b27eb4 diff --git a/win/makefile b/win/makefile index 6ab1166..b094e4e 100644 --- a/win/makefile +++ b/win/makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2008 Index Data +# Copyright (C) 1998-2011 Index Data # All rights reserved. ########################################################### @@ -17,11 +17,11 @@ ICONV_DIR=\iconv-1.9.2.win32 # libxslt HAVE_LIBXSLT=1 -LIBXSLT_DIR=\libxslt-1.1.19.win32 +LIBXSLT_DIR=\libxslt-1.1.26.win32 # libxml2 (used by libxslt) HAVE_LIBXML2=1 -LIBXML2_DIR=\libxml2-2.6.28.win32 +LIBXML2_DIR=\libxml2-2.7.6.win32 # zlib compression (used by libxml2) ZLIB_DIR=\zlib-1.2.3.win32 @@ -72,11 +72,11 @@ dll: $(YAZPROXY_DLL) proxy: $(YAZPROXY) !if $(DEBUG) -YAZD=yaz3d -YAZPPD=yazpp3d +YAZD=yaz4d +YAZPPD=yazpp4d !else -YAZD=yaz3 -YAZPPD=yazpp3 +YAZD=yaz4 +YAZPPD=yazpp4 !endif # YAZ includes & libs @@ -198,15 +198,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