X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=75fa43184bc39f5f963b93602956e4fdd604669f;hb=43afefc5b93c3e3336d974605fa5b15946e839d2;hp=a870fcc84a53292bb1127cf653c7c23df623f465;hpb=50597d2f7d3607e91c94601eb8eb495d73be3eae;p=metaproxy-moved-to-github.git diff --git a/win/makefile b/win/makefile index a870fcc..75fa431 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.21 +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" \ @@ -220,7 +221,9 @@ PROJECT_DLL_OBJS = \ $(OBJDIR)\filter_bounce.obj \ $(OBJDIR)\filter_cql_to_rpn.obj \ $(OBJDIR)\filter_frontend_net.obj \ + $(OBJDIR)\filter_http_client.obj \ $(OBJDIR)\filter_http_file.obj \ + $(OBJDIR)\filter_http_rewrite1.obj \ $(OBJDIR)\filter_limit.obj \ $(OBJDIR)\filter_load_balance.obj \ $(OBJDIR)\filter_log.obj \ @@ -228,6 +231,7 @@ PROJECT_DLL_OBJS = \ $(OBJDIR)\filter_query_rewrite.obj \ $(OBJDIR)\filter_record_transform.obj \ $(OBJDIR)\filter_session_shared.obj \ + $(OBJDIR)\filter_sort.obj \ $(OBJDIR)\filter_sru_to_z3950.obj \ $(OBJDIR)\filter_template.obj \ $(OBJDIR)\filter_virt_db.obj \