X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=win%2Fmakefile;h=80c6ccd257b36c554ce087ddd13f6fbe73ae196e;hb=8850edb2192fe310c51a7044b5f631cf351ec07e;hp=14d773459101a2a9a27f9e67e5ecbaab3a5a08e8;hpb=41553bd90a6c18e978c05d72dcb5d35f77885006;p=metaproxy-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 14d7734..80c6ccd 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,11 +1,14 @@
 # Copyright (C) 2005-2006, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.11 2006-03-30 12:52:33 adam Exp $
+# $Id: makefile,v 1.13 2006-04-30 07:46:42 adam Exp $
 
 # MS NMAKE makefile for metaproxy
 
 # Parameters that we customize often.
-DEBUG=0   # 0 for release, 1 for debug
+DEBUG=1   # 0 for release, 1 for debug
+
+# Metaproxy version
+VERSION=1.0.2
 
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
@@ -13,7 +16,9 @@ YAZPP_DIR=..\..\yazpp
 
 # Boost
 BOOST=\boost
-BOOSTVER=1_33
+BOOST_VERSION=1_33_1
+BOOST_TOOLSET=vc80 # vc80 for VS 2005, vc71 for 2003
+BOOST_MODEL=mt
 
 # libxml2 + libxslt + associates
 ZLIB_DIR=\zlib-1.2.3.win32
@@ -49,6 +54,7 @@ SRCDIR=$(ROOTDIR)\src       # for the case we move them under src
 TMPDIR=$(ROOTDIR)\win\tmp
 TMP=$(TMPDIR)
 
+
 ##########################################################
 ############### Targets - what to make
 ###########################################################
@@ -69,29 +75,38 @@ test_pipe: $(TEST_PIPE)
 ############### Compiler and linker options 
 ###########################################################
 
+!if $(DEBUG)
+YAZD=yazd
+YAZPPD=yazppd
+!else
+YAZD=yaz
+YAZPP=yazpp
+!endif
+
 # YAZ includes & libs
-YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib"
+YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib"
 YAZ_DEF=/DYAZ_USE_NEW_LOG=1 /I"$(YAZ_DIR)\include"
 
 # Copy yaz.dll to our bin
-yaz: $(BINDIR)\yaz.dll
-$(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll
-  copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR)
+yaz: $(BINDIR)\$(YAZD).dll
+$(BINDIR)\$(YAZD).dll: $(YAZ_DIR)\bin\$(YAZD).dll
+  copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR)
 
 # YAZ++ includes & libs
-YAZPP_LIB="$(YAZPP_DIR)\lib\yazpp.lib"
+YAZPP_LIB="$(YAZPP_DIR)\lib\$(YAZPPD).lib"
 YAZPP_DEF=/I"$(YAZPP_DIR)\include"
 
 # Copy yazpp.dll to our bin
-yazpp: $(BINDIR)\yazpp.dll
-$(BINDIR)\yazpp.dll: $(YAZPP_DIR)\bin\yazpp.dll
-  copy "$(YAZPP_DIR)\bin\yazpp.dll" $(BINDIR)
+yazpp: $(BINDIR)\$(YAZPPD).dll
+$(BINDIR)\$(YAZPPD).dll: $(YAZPP_DIR)\bin\$(YAZPPD).dll
+  copy "$(YAZPP_DIR)\bin\$(YAZPPD).dll" $(BINDIR)
 
 # 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)
 	copy $(LIBXML2_DIR)\bin\libxml2.dll $(BINDIR)
 	copy $(LIBXSLT_DIR)\bin\libxslt.dll $(BINDIR)
 
@@ -102,12 +117,18 @@ $(SRCDIR)\config.hpp:
 
 # Boost 
 #
-BOOST_DEF = /I"$(BOOST)\include\boost-$(BOOSTVER)"
+!if $(DEBUG)
+BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-gd-$(BOOST_VERSION).lib
+!else
+BOOST_LIB_SUFFIX=$(BOOST_TOOLSET)-$(BOOST_MODEL)-$(BOOST_VERSION).lib
+!endif
+
+BOOST_DEF = /I"$(BOOST)\include\boost-$(BOOST_VERSION)"
 BOOST_LIB = \
-    "$(BOOST)\lib\libboost_date_time-vc71-mt-$(BOOSTVER).lib" \
-    "$(BOOST)\lib\libboost_program_options-vc71-mt-$(BOOSTVER).lib" \
-    "$(BOOST)\lib\libboost_thread-vc71-mt-$(BOOSTVER).lib" \
-    "$(BOOST)\lib\libboost_unit_test_framework-vc71-mt-$(BOOSTVER).lib" 
+    "$(BOOST)\lib\libboost_date_time-$(BOOST_LIB_SUFFIX)" \
+    "$(BOOST)\lib\libboost_program_options-$(BOOST_LIB_SUFFIX)" \
+    "$(BOOST)\lib\libboost_thread-$(BOOST_LIB_SUFFIX)" \
+    "$(BOOST)\lib\libboost_unit_test_framework-$(BOOST_LIB_SUFFIX)"
 
 
 LIBXSLT_DEF = \
@@ -121,14 +142,14 @@ LIBXSLT_LIB = \
     "$(LIBXSLT_DIR)\lib\libxslt.lib"
 
 COMMON_C_OPTIONS=          \
-  /nologo /W3 /GX /FD /c   \
+  /nologo /W3 /EHsc /FD /c \
   $(YAZ_DEF)               \
   $(YAZPP_DEF)             \
   $(BOOST_DEF)             \
   $(LIBXSLT_DEF)	   \
+  /D VERSION=\"$(VERSION)\" \
   /D "_WINDOWS"            \
   /D "WIN32"               \
-  /EHsc \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\" 	   \
@@ -136,7 +157,7 @@ COMMON_C_OPTIONS=          \
 
 DEBUG_C_OPTIONS=  \
   /D "_DEBUG"      \
-  /MDd  /Od /YX /Zi /Gm
+  /MDd  /Od /Zi /Gm
 
 RELEASE_C_OPTIONS=  \
   /D "NDEBUG"        \
@@ -153,7 +174,6 @@ RELEASE_C_OPTIONS=  \
 # /MDd = Runtime library: Multithread DLL (debug)
 # /Od  = Disable optimising (debug)
 # /O2  = Optimize for speed
-# /YX  = Automatic use of precomipled headers
 # /Gm  = Minimal rebuild (some cpp class stuff)
 # /Zi  = Program database for debuggers
 # /ZI  = Pgm database with special "edit&continue" stuff - not available in C5