X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=abc61a1b3768db1ea0904505cf0ddf428f729280;hb=296621fc8d23651d72fc9c72b80fa3e82547f3bf;hp=790105cc277d978c809e0af854a2ea58ab6324ce;hpb=3c88b644c6dd26392424ddb366ed58f8dc3241cf;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 790105c..abc61a1 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,23 +8,22 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # Metaproxy version
-VERSION=1.3.62
+VERSION=1.8.9
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
 YAZPP_DIR=..\..\yazpp
 
 # Boost
-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=\local\boost_1_57_0
+BOOST_VERSION=1_57
+BOOST_LIBPATH=$(BOOST)\lib32-msvc-12.0
+BOOST_TOOLSET=vc120 # vs120 for VS2013, vc90 for VS2008, vc80 for VS 2005
 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.6.win32
-LIBXSLT_DIR=\libxslt-1.1.26.win32
+LIBXML2_DIR=\libxml2-2.9.2.win32
+LIBXSLT_DIR=\libxslt-1.1.28.win32
 
 # The targets
 
@@ -102,11 +102,9 @@ $(BINDIR)\$(YAZPPD).dll: "$(YAZPP_DIR)\bin\$(YAZPPD).dll"
 # Copy libxslt and associates to our bin directory
 libxslt: $(BINDIR)\libxslt.dll
 
-$(BINDIR)\libxslt.dll: "$(LIBXSLT_DIR)\bin\libxslt.dll"
-	copy "$(ICONV_DIR)\bin\iconv.dll" $(BINDIR)
-	copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
+$(BINDIR)\libxslt.dll: "$(LIBXSLT_DIR)\lib\libxslt.dll"
 	copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
-	copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
+	copy "$(LIBXSLT_DIR)\lib\libxslt.dll" $(BINDIR)
 
 config: $(SRCDIR)\config.hpp
 
@@ -123,24 +121,23 @@ 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)" 
 
 LIBXSLT_DEF = \
-	      /I"$(ICONV_DIR)\include" \
-	      /I"$(LIBXML2_DIR)\include" \
+	      /I"$(LIBXML2_DIR)\include\libxml2" \
 	      /I"$(LIBXSLT_DIR)\include"
 
 LIBXSLT_LIB = \
-    "$(ICONV_DIR)\lib\iconv.lib" \
     "$(LIBXML2_DIR)\lib\libxml2.lib" \
     "$(LIBXSLT_DIR)\lib\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,7 +214,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_cql_rpn.obj \
 	$(OBJDIR)\filter_frontend_net.obj \
 	$(OBJDIR)\filter_http_client.obj \
 	$(OBJDIR)\filter_http_file.obj \