X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=7c3d2a64ed7dae6eb791ad90bda7ac790decaa62;hb=8ced8e7b5de3ecba12ac68ce5c5e8cddf40d800f;hp=f309b3010b3fd3fff7acd6cab3919f81bedd5b47;hpb=eb86341dc6554502297a142122028ddea7f246dd;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index f309b30..7c3d2a6 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2009, Index Data ApS
+# Copyright (C) 2005-2013 Index Data
 # All rights reserved.
 
 # MS NMAKE makefile for metaproxy
@@ -7,23 +7,23 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.0.18
+VERSION=1.3.51
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
 YAZPP_DIR=..\..\yazpp
 
 # Boost
-BOOST=\program files\boost\boost_1_35_0
-BOOST_VERSION=1_35
+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
 
 # libxml2 + libxslt + associates
 ZLIB_DIR=\zlib-1.2.3.win32
 ICONV_DIR=\iconv-1.9.2.win32
-LIBXML2_DIR=\libxml2-2.7.1.win32
-LIBXSLT_DIR=\libxslt-1.1.24.win32
+LIBXML2_DIR=\libxml2-2.7.6.win32
+LIBXSLT_DIR=\libxslt-1.1.26.win32
 
 # The targets
 
@@ -76,11 +76,11 @@ test_pipe: $(TEST_PIPE)
 ###########################################################
 
 !if $(DEBUG)
-YAZD=yaz3d
-YAZPPD=yazpp3d
+YAZD=yaz4d
+YAZPPD=yazpp5d
 !else
-YAZD=yaz3
-YAZPPD=yazpp3
+YAZD=yaz4
+YAZPPD=yazpp5
 !endif
 
 # YAZ includes & libs
@@ -125,12 +125,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_thread-$(BOOST_LIB_SUFFIX)"  
-
-#"$(BOOST)\lib\libboost_program_options-$(BOOST_LIB_SUFFIX)" \
-# "$(BOOST)\lib\libboost_unit_test_framework-$(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" \
@@ -186,14 +184,10 @@ 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) 
 
-COMMON_LNK_OPTIONS= /nologo \
-                  /subsystem:windows \
-                  /machine:i386 \
-		  /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
 
 DEBUG_LNK_OPTIONS= /debug 
 
@@ -228,18 +222,20 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\filter_cql_to_rpn.obj \
 	$(OBJDIR)\filter_frontend_net.obj \
 	$(OBJDIR)\filter_http_file.obj \
+        $(OBJDIR)\filter_limit.obj \
         $(OBJDIR)\filter_load_balance.obj \
         $(OBJDIR)\filter_log.obj \
 	$(OBJDIR)\filter_multi.obj \
 	$(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 \
         $(OBJDIR)\filter_z3950_client.obj \
         $(OBJDIR)\filter_zeerex_explain.obj \
-        $(OBJDIR)\filter_limit.obj \
+        $(OBJDIR)\filter_zoom.obj \
 	$(OBJDIR)\gduutil.obj \
 	$(OBJDIR)\origin.obj \
 	$(OBJDIR)\package.obj \
@@ -250,6 +246,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