From 3f37ea6deb7776cf550b15e21bccc0a059b9e850 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 18 Nov 2008 12:06:54 +0100
Subject: [PATCH] Updated makefile for VS 2008 + Boost 1.35.

---
 src/filter_sru_to_z3950.cpp |    3 +++
 win/makefile                |   40 ++++++++++++++--------------------------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/src/filter_sru_to_z3950.cpp b/src/filter_sru_to_z3950.cpp
index 328188d..72807b0 100644
--- a/src/filter_sru_to_z3950.cpp
+++ b/src/filter_sru_to_z3950.cpp
@@ -16,6 +16,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+// make std::min actually work on Windows
+#define NOMINMAX 1
+
 #include "config.hpp"
 #include "filter.hpp"
 #include "package.hpp"
diff --git a/win/makefile b/win/makefile
index c782862..5911503 100644
--- a/win/makefile
+++ b/win/makefile
@@ -15,9 +15,9 @@ YAZ_DIR=..\..\yaz
 YAZPP_DIR=..\..\yazpp
 
 # Boost
-BOOST=\program files\boost\boost_1_34_1
-BOOST_VERSION=1_34_1
-BOOST_TOOLSET=vc80 # vc80 for VS 2005, vc71 for 2003
+BOOST=\program files\boost\boost_1_35_0
+BOOST_VERSION=1_35
+BOOST_TOOLSET=vc90 # vc90 for VS2008, vc80 for VS 2005, vc71 for 2003
 BOOST_MODEL=mt
 
 # libxml2 + libxslt + associates
@@ -30,10 +30,9 @@ LIBXSLT_DIR=\libxslt-1.1.24.win32
 
 default: all
 
-all: dirs config yaz yazpp libxslt dll progs
-
-progs: metaproxy ex_filter_frontend_net test_pipe
+all: dirs config yaz yazpp libxslt progs
 
+progs: metaproxy ex_filter_frontend_net # test_pipe does not work
 NSIS="c:\program files\nsis\makensis.exe"
 
 nsis: all
@@ -64,14 +63,11 @@ TMP=$(TMPDIR)
 ############### Targets - what to make
 ###########################################################
 
-PROJECT_DLL=$(BINDIR)\metaproxy.dll
-PROJECT_IMPLIB=$(LIBDIR)\metaproxy.lib
 EX_FILTER_FRONTEND_NET=$(BINDIR)\ex_filter_frontend_net.exe
 METAPROXY_PROG=$(BINDIR)\metaproxy.exe
 TEST_PIPE=$(BINDIR)\test_pipe.exe
 
 # shortcut names defined here
-dll: $(PROJECT_DLL)
 ex_filter_frontend_net: $(EX_FILTER_FRONTEND_NET)
 metaproxy: $(METAPROXY_PROG)
 test_pipe: $(TEST_PIPE)
@@ -131,9 +127,10 @@ 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_program_options-$(BOOST_LIB_SUFFIX)" \
-    "$(BOOST)\lib\libboost_thread-$(BOOST_LIB_SUFFIX)" \
-    "$(BOOST)\lib\libboost_unit_test_framework-$(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)"
 
 
 LIBXSLT_DEF = \
@@ -296,16 +293,7 @@ $(PROJECT_RES): $(PROJECT_RC)
 ############### Linking
 ###########################################################
 
-$(PROJECT_DLL) $(PROJECT_IMPLIB): "$(BINDIR)" $(PROJECT_DLL_OBJS)
-	$(LINK) \
-		$(LNKOPT) \
-		$(LINK_LIBS) \
-		$(DLL_LINK_OPTIONS) \
-		$(PROJECT_DLL_OBJS) \
-		/out:"$(PROJECT_DLL)" \
-		/implib:"$(PROJECT_IMPLIB)"
-
-$(EX_FILTER_FRONTEND_NET) : "$(BINDIR)" $(EX_FILTER_FRONTEND_NET_OBJS) $(PROJECT_IMPLIB)
+$(EX_FILTER_FRONTEND_NET) : "$(BINDIR)" $(EX_FILTER_FRONTEND_NET_OBJS) $(PROJECT_DLL_OBJS)
 	$(LINK) \
 		$(LNKOPT) \
 		$(PROG_LINK_OPTIONS) \
@@ -314,22 +302,22 @@ $(EX_FILTER_FRONTEND_NET) : "$(BINDIR)" $(EX_FILTER_FRONTEND_NET_OBJS) $(PROJECT
 		$(EX_FILTER_FRONTEND_NET_OBJS) \
 		/out:$(EX_FILTER_FRONTEND_NET) 
 
-$(METAPROXY_PROG) : "$(BINDIR)" $(METAPROXY_OBJS) $(PROJECT_IMPLIB)
+$(METAPROXY_PROG) : "$(BINDIR)" $(METAPROXY_OBJS) $(PROJECT_DLL_OBJS)
 	$(LINK) \
 		$(LNKOPT) \
 		$(PROG_LINK_OPTIONS) \
 		$(LINK_LIBS) \
-		$(PROJECT_DLL_OBJS) \
 		$(METAPROXY_OBJS) \
+		$(PROJECT_DLL_OBJS) \
 		/out:$(METAPROXY_PROG) 
 
-$(TEST_PIPE) : "$(BINDIR)" $(TEST_PIPE_OBJS) $(PROJECT_IMPLIB)
+$(TEST_PIPE) : "$(BINDIR)" $(TEST_PIPE_OBJS) $(PROJECT_DLL_OBJS)
 	$(LINK) \
 		$(LNKOPT) \
 		$(PROG_LINK_OPTIONS) \
 		$(LINK_LIBS) \
-		$(TEST_PIPE_OBJS) \
 		$(PROJECT_DLL_OBJS) \
+		$(TEST_PIPE_OBJS) \
 		/out:$(TEST_PIPE)
 
 ############## clean
-- 
1.7.10.4