X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=win%2Fmakefile;h=714185c8bf93d8e81afd79f8131b3effd9f29100;hb=74d16c70e558c6b5fb0ff5b057a047d4da6d5a66;hp=f309b3010b3fd3fff7acd6cab3919f81bedd5b47;hpb=eb86341dc6554502297a142122028ddea7f246dd;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index f309b30..714185c 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2009, Index Data ApS
+# Copyright (C) 2005-2010, 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.1.1
 
 # 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_40
+BOOST_VERSION=1_40
 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=yazpp4d
 !else
-YAZD=yaz3
-YAZPPD=yazpp3
+YAZD=yaz4
+YAZPPD=yazpp4
 !endif
 
 # YAZ includes & libs
@@ -127,6 +127,7 @@ 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)"
@@ -223,11 +224,13 @@ PROJECT_DLL_OBJS = \
 	$(OBJDIR)\factory_static.obj \
         $(OBJDIR)\filter.obj \
 	$(OBJDIR)\filter_auth_simple.obj \
+	$(OBJDIR)\filter_cgi.obj \
         $(OBJDIR)\filter_backend_test.obj \
         $(OBJDIR)\filter_bounce.obj \
         $(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 \
@@ -239,7 +242,6 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\filter_virt_db.obj \
         $(OBJDIR)\filter_z3950_client.obj \
         $(OBJDIR)\filter_zeerex_explain.obj \
-        $(OBJDIR)\filter_limit.obj \
 	$(OBJDIR)\gduutil.obj \
 	$(OBJDIR)\origin.obj \
 	$(OBJDIR)\package.obj \