X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=8a1885f4a7bb0c624d9d1ed05c5a2fefe982ab8f;hb=2372a72166b2d1e5f7f7ae847f037e68f0862fd1;hp=18ce38b51bea6398fbf32596cde0f4645bcecf85;hpb=964ec58fa0d8664752262cef2f2707f10b16ba9c;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 18ce38b..8a1885f 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.4.0
+VERSION=1.6.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
 
@@ -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)             \