X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=b24e85e4ac15da0538ba4a3e5b73cd79c022edea;hb=f22c5866171577fa6a27f07a784e8b1b84a331e1;hp=b76348511d0e4d19b559cceb1e393d4159ad5604;hpb=eba87fb71f077336da1209320b2e3bb6b6ef27aa;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index b763485..b24e85e 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,6 @@
-# Copyright (C) 2005-2013 Index Data
-# All rights reserved.
+# This file is part of metaproxy
+# Copyright (C) Index Data
+# See the file LICENSE for details.
 
 # MS NMAKE makefile for metaproxy
 
@@ -7,15 +8,16 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.3.58
+VERSION=1.7.0
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
 YAZPP_DIR=..\..\yazpp
 
 # Boost
-BOOST=\program files\boost\boost_1_51
-BOOST_VERSION=1_51
+BOOST=\local\boost_1_55_0
+BOOST_VERSION=1_55
+BOOST_LIBPATH=$(BOOST)\lib32-msvc-9.0
 BOOST_TOOLSET=vc90 # vc90 for VS2008, vc80 for VS 2005, vc71 for 2003
 BOOST_MODEL=mt
 
@@ -74,11 +76,11 @@ test_pipe: $(TEST_PIPE)
 ###########################################################
 
 !if $(DEBUG)
-YAZD=yaz4d
-YAZPPD=yazpp5d
+YAZD=yaz5d
+YAZPPD=yazpp6d
 !else
-YAZD=yaz4
-YAZPPD=yazpp5
+YAZD=yaz5
+YAZPPD=yazpp6
 !endif
 
 # YAZ includes & libs
@@ -123,7 +125,7 @@ BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-$(BOOST_VERSION).lib
 
 BOOST_DEF = /I"$(BOOST)"
 BOOST_LIB = \
-	     /LIBPATH:"$(BOOST)\lib" \
+	     /LIBPATH:"$(BOOST_LIBPATH)" \
     "libboost_thread-$(BOOST_LIB_SUFFIX)"  \
     "libboost_regex-$(BOOST_LIB_SUFFIX)" \
     "libboost_date_time-$(BOOST_LIB_SUFFIX)" 
@@ -141,6 +143,7 @@ LIBXSLT_LIB = \
 COMMON_C_OPTIONS=          \
   /nologo /W3 /EHsc /FD /c \
   /D "_CRT_SECURE_NO_DEPRECATE" \
+  /D _SCL_SECURE_NO_WARNINGS \
   $(YAZ_DEF)               \
   $(YAZPP_DEF)             \
   $(BOOST_DEF)             \
@@ -217,10 +220,11 @@ PROJECT_DLL_OBJS = \
 	$(OBJDIR)\filter_auth_simple.obj \
         $(OBJDIR)\filter_backend_test.obj \
         $(OBJDIR)\filter_bounce.obj \
-        $(OBJDIR)\filter_cql_to_rpn.obj \
+        $(OBJDIR)\filter_cql_rpn.obj \
 	$(OBJDIR)\filter_frontend_net.obj \
 	$(OBJDIR)\filter_http_client.obj \
 	$(OBJDIR)\filter_http_file.obj \
+	$(OBJDIR)\filter_http_rewrite.obj \
 	$(OBJDIR)\filter_http_rewrite1.obj \
         $(OBJDIR)\filter_limit.obj \
         $(OBJDIR)\filter_load_balance.obj \
@@ -239,6 +243,7 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\filter_zeerex_explain.obj \
         $(OBJDIR)\filter_zoom.obj \
 	$(OBJDIR)\gduutil.obj \
+	$(OBJDIR)\html_parser.obj \
 	$(OBJDIR)\origin.obj \
 	$(OBJDIR)\package.obj \
 	$(OBJDIR)\pipe.obj \