From 8eff7fecccca024ff59c9c305592fe8e3c5cab36 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 25 Jul 2011 14:46:11 +0200 Subject: [PATCH] Fixes for Win makefile. Update to Boost 1.43 Unfortunately, Boost 1.46 and Boost 1.47 have linking problems. Some .lib refers to libboost_thread*.lib while only boost_thread*lib is available. Version 1.43 do not have this problem (.lib files still have prefix "lib"). --- win/makefile | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/win/makefile b/win/makefile index 326132b..375f6fe 100644 --- a/win/makefile +++ b/win/makefile @@ -14,8 +14,8 @@ 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) @@ -250,6 +245,7 @@ PROJECT_DLL_OBJS = \ $(OBJDIR)\sru_util.obj \ $(OBJDIR)\thread_pool_observer.obj \ $(OBJDIR)\torus.obj \ + $(OBJDIR)\url_recipe.obj \ $(OBJDIR)\util.obj \ $(OBJDIR)\xmlutil.obj -- 1.7.10.4