X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=d3336bf7db90c74dc78c25434d825d9c680321f0;hb=0032223721bceb99c4998b55d8c814329238259b;hp=f9d3e96045845396cf9de834bc0093c9e847a906;hpb=a340fdbb3e3c6bd7d8ceeda3d98a7b4af1e2c921;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index f9d3e96..d3336bf 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
-# Copyright (C) 2005-2006, Index Data ApS
+# Copyright (C) 2005-2008, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.27 2007-01-11 12:29:02 adam Exp $
+# $Id: makefile,v 1.37 2008-02-29 15:25:20 adam Exp $
 
 # MS NMAKE makefile for metaproxy
 
@@ -8,23 +8,23 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.0.7
+VERSION=1.0.14
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
 YAZPP_DIR=..\..\yazpp
 
 # Boost
-BOOST=\boost
-BOOST_VERSION=1_33_1
+BOOST=\program files\boost\boost_1_34_1
+BOOST_VERSION=1_34_1
 BOOST_TOOLSET=vc80 # 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.6.26.win32
-LIBXSLT_DIR=\libxslt-1.1.17.win32
+LIBXML2_DIR=\libxml2-2.6.28.win32
+LIBXSLT_DIR=\libxslt-1.1.19.win32
 
 # The targets
 
@@ -32,7 +32,7 @@ default: all
 
 all: dirs config yaz yazpp libxslt dll progs
 
-progs: ex_filter_frontend_net test_pipe metaproxy
+progs: metaproxy ex_filter_frontend_net test_pipe
 
 NSIS="c:\program files\nsis\makensis.exe"
 
@@ -81,11 +81,11 @@ test_pipe: $(TEST_PIPE)
 ###########################################################
 
 !if $(DEBUG)
-YAZD=yazd
-YAZPPD=yazpp_1_d
+YAZD=yaz3d
+YAZPPD=yazpp3d
 !else
-YAZD=yaz
-YAZPPD=yazpp_1
+YAZD=yaz3
+YAZPPD=yazpp3
 !endif
 
 # YAZ includes & libs
@@ -128,7 +128,7 @@ BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-gd-$(BOOST_VERSION).lib
 BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-$(BOOST_VERSION).lib
 !endif
 
-BOOST_DEF = /I"$(BOOST)\include\boost-$(BOOST_VERSION)"
+BOOST_DEF = /I"$(BOOST)"
 BOOST_LIB = \
     "$(BOOST)\lib\libboost_date_time-$(BOOST_LIB_SUFFIX)" \
     "$(BOOST)\lib\libboost_program_options-$(BOOST_LIB_SUFFIX)" \
@@ -229,6 +229,7 @@ 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_frontend_net.obj \
 	$(OBJDIR)\filter_http_file.obj \
         $(OBJDIR)\filter_load_balance.obj \