X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=2c0c58efd444276cfeb5861c13d271bed530e919;hb=2de1ea231bd0c0c1147eb845fd9bdfd94b3974fe;hp=330ca791cb489b63a04ba7b3a973df84498ce69a;hpb=10eb3fb47dbe530687683849b08fec6b39a3f6a6;p=metaproxy-moved-to-github.git diff --git a/win/makefile b/win/makefile index 330ca79..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,15 +7,15 @@ DEBUG=0 # 0 for release, 1 for debug # Metaproxy version -VERSION=1.3.41 +VERSION=1.3.55 # YAZ and YAZ++ directories YAZ_DIR=..\..\yaz YAZPP_DIR=..\..\yazpp # Boost -BOOST=\program files\boost\boost_1_43 -BOOST_VERSION=1_43 +BOOST=\program files\boost\boost_1_51 +BOOST_VERSION=1_51 BOOST_TOOLSET=vc90 # vc90 for VS2008, vc80 for VS 2005, vc71 for 2003 BOOST_MODEL=mt @@ -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" \