X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=aff8420d29fac026af95c663725aec2755613b4f;hp=c302e1dd232f3ef8db802f5f63c611184cc4e7c4;hb=59ff238376a0cb923b3e988d1601bb60bc9d4be2;hpb=b0efccd2c27fd19009c29f6fd69169c5860ab743 diff --git a/win/makefile b/win/makefile index c302e1d..aff8420 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.11 2007-01-11 12:21:25 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.23+.win32 # libxml2 (used by libxslt) HAVE_LIBXML2=1 -LIBXML2_DIR=\libxml2-2.6.26.win32 +LIBXML2_DIR=\libxml2-2.6.32+.win32 # zlib compression (used by libxml2) ZLIB_DIR=\zlib-1.2.3.win32 @@ -63,8 +62,8 @@ OBJDIR=$(WINDIR)\obj # where we store intermediate files TMPDIR=$(ROOTDIR)\win\tmp TMP=$(TMPDIR) -YAZPROXY_DLL=$(BINDIR)\yazproxy.dll -YAZPROXY_IMPLIB=$(LIBDIR)\yazproxy.lib +YAZPROXY_DLL=$(BINDIR)\yazproxy2.dll +YAZPROXY_IMPLIB=$(LIBDIR)\yazproxy2.lib YAZPROXY=$(BINDIR)\yazproxy.exe @@ -73,11 +72,11 @@ dll: $(YAZPROXY_DLL) proxy: $(YAZPROXY) !if $(DEBUG) -YAZD=yazd -YAZPPD=yazpp_1_d +YAZD=yaz3d +YAZPPD=yazpp3d !else -YAZD=yaz -YAZPPD=yazpp_1 +YAZD=yaz3 +YAZPPD=yazpp3 !endif # YAZ includes & libs @@ -199,8 +198,7 @@ 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=\