X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=inline;f=win%2Fmakefile;h=2c0c58efd444276cfeb5861c13d271bed530e919;hb=2de1ea231bd0c0c1147eb845fd9bdfd94b3974fe;hp=84ff171cff3606aa72add21d33e3744ecd3ae36f;hpb=d609c061e5cee88e8baf6c045f197a38cb0d4a59;p=metaproxy-moved-to-github.git diff --git a/win/makefile b/win/makefile index 84ff171..2c0c58e 100644 --- a/win/makefile +++ b/win/makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2012 Index Data +# Copyright (C) 2005-2013 Index Data # All rights reserved. # MS NMAKE makefile for metaproxy @@ -7,7 +7,7 @@ DEBUG=0 # 0 for release, 1 for debug # Metaproxy version -VERSION=1.3.49 +VERSION=1.3.55 # YAZ and YAZ++ directories YAZ_DIR=..\..\yaz @@ -77,10 +77,10 @@ test_pipe: $(TEST_PIPE) !if $(DEBUG) YAZD=yaz4d -YAZPPD=yazpp4d +YAZPPD=yazpp5d !else YAZD=yaz4 -YAZPPD=yazpp4 +YAZPPD=yazpp5 !endif # YAZ includes & libs @@ -125,9 +125,10 @@ BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-$(BOOST_VERSION).lib BOOST_DEF = /I"$(BOOST)" BOOST_LIB = \ - "$(BOOST)\lib\libboost_thread-$(BOOST_LIB_SUFFIX)" \ - "$(BOOST)\lib\libboost_regex-$(BOOST_LIB_SUFFIX)" \ - "$(BOOST)\lib\libboost_date_time-$(BOOST_LIB_SUFFIX)" + /LIBPATH:"$(BOOST)\lib" \ + "libboost_thread-$(BOOST_LIB_SUFFIX)" \ + "libboost_regex-$(BOOST_LIB_SUFFIX)" \ + "libboost_date_time-$(BOOST_LIB_SUFFIX)" LIBXSLT_DEF = \ /I"$(ICONV_DIR)\include" \