X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=0f2aea332a9a71753b23f476c0dac3b73c1b89ba;hp=efae2b8239de59c0c6d62de4f96ee7f71a605c4a;hb=e3f299e011974edea3defb185b12cc13676a1734;hpb=c7c83d00ab35e7a8c5f0f801446cfe24ef71313e diff --git a/win/makefile b/win/makefile index efae2b8..0f2aea3 100644 --- a/win/makefile +++ b/win/makefile @@ -1,6 +1,5 @@ -# Copyright (C) 1999-2006, Index Data ApS +# Copyright (C) 1998-2008 Index Data # All rights reserved. -# $Id: makefile,v 1.12 2007-05-06 20:30:24 adam Exp $ ########################################################### ############### Parameters @@ -18,11 +17,11 @@ ICONV_DIR=\iconv-1.9.2.win32 # libxslt HAVE_LIBXSLT=1 -LIBXSLT_DIR=\libxslt-1.1.17.win32 +LIBXSLT_DIR=\libxslt-1.1.26.win32 # libxml2 (used by libxslt) HAVE_LIBXML2=1 -LIBXML2_DIR=\libxml2-2.6.26.win32 +LIBXML2_DIR=\libxml2-2.7.6.win32 # zlib compression (used by libxml2) ZLIB_DIR=\zlib-1.2.3.win32 @@ -73,11 +72,11 @@ dll: $(YAZPROXY_DLL) proxy: $(YAZPROXY) !if $(DEBUG) -YAZD=yaz3d -YAZPPD=yazpp2d +YAZD=yaz4d +YAZPPD=yazpp4d !else -YAZD=yaz3 -YAZPPD=yazpp2 +YAZD=yaz4 +YAZPPD=yazpp4 !endif # YAZ includes & libs @@ -199,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