X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=d98781df3dbbda964df0ed96148f17b4a3314de8;hb=61b5bda0da8de41af63ae13d0145ca75806d4eee;hp=3e396df66fa7370717922b852ad93b0132903d40;hpb=a2b819d4e62ed333578070c18822d61b4b8b0dfd;p=metaproxy-moved-to-github.git diff --git a/win/makefile b/win/makefile index 3e396df..d98781d 100644 --- a/win/makefile +++ b/win/makefile @@ -7,15 +7,15 @@ DEBUG=0 # 0 for release, 1 for debug # Metaproxy version -VERSION=1.2.4 +VERSION=1.3.19 # YAZ and YAZ++ directories YAZ_DIR=..\..\yaz YAZPP_DIR=..\..\yazpp # Boost -BOOST=\program files\boost\boost_1_40 -BOOST_VERSION=1_40 +BOOST=\program files\boost\boost_1_43 +BOOST_VERSION=1_43 BOOST_TOOLSET=vc90 # vc90 for VS2008, vc80 for VS 2005, vc71 for 2003 BOOST_MODEL=mt @@ -125,13 +125,9 @@ BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-$(BOOST_VERSION).lib BOOST_DEF = /I"$(BOOST)" BOOST_LIB = \ - "$(BOOST)\lib\libboost_date_time-$(BOOST_LIB_SUFFIX)" \ - "$(BOOST)\lib\libboost_thread-$(BOOST_LIB_SUFFIX)" - - -#"$(BOOST)\lib\libboost_program_options-$(BOOST_LIB_SUFFIX)" \ -# "$(BOOST)\lib\libboost_unit_test_framework-$(BOOST_LIB_SUFFIX)" - + "$(BOOST)\lib\libboost_thread-$(BOOST_LIB_SUFFIX)" \ + "$(BOOST)\lib\libboost_regex-$(BOOST_LIB_SUFFIX)" \ + "$(BOOST)\lib\libboost_date_time-$(BOOST_LIB_SUFFIX)" LIBXSLT_DEF = \ /I"$(ICONV_DIR)\include" \ @@ -187,7 +183,6 @@ LINK=link.exe LINK_LIBS=kernel32.lib user32.lib gdi32.lib advapi32.lib uuid.lib \ wsock32.lib advapi32.lib \ - $(BOOST_LIB) \ $(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXSLT_LIB) \ $(BOOST_LIB) @@ -238,6 +233,7 @@ PROJECT_DLL_OBJS = \ $(OBJDIR)\filter_virt_db.obj \ $(OBJDIR)\filter_z3950_client.obj \ $(OBJDIR)\filter_zeerex_explain.obj \ + $(OBJDIR)\filter_zoom.obj \ $(OBJDIR)\gduutil.obj \ $(OBJDIR)\origin.obj \ $(OBJDIR)\package.obj \ @@ -248,6 +244,8 @@ PROJECT_DLL_OBJS = \ $(OBJDIR)\session.obj \ $(OBJDIR)\sru_util.obj \ $(OBJDIR)\thread_pool_observer.obj \ + $(OBJDIR)\torus.obj \ + $(OBJDIR)\url_recipe.obj \ $(OBJDIR)\util.obj \ $(OBJDIR)\xmlutil.obj