Fixed bug #568: Update win/makefile for VS 2005.

[metaproxy-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index 338423b..82a3936 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,19 +1,24 @@
-# Copyright (C) 2005, Index Data ApS
+# Copyright (C) 2005-2006, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.9 2006-03-16 09:38:43 adam Exp $
+# $Id: makefile,v 1.12 2006-04-30 06:51:49 adam Exp $
 
-# MS NMAKE makefile for yp2
+# MS NMAKE makefile for metaproxy
 
 # Parameters that we customize often.
 DEBUG=0   # 0 for release, 1 for debug
 
+# Metaproxy version
+VERSION=1.0.2
+
 # YAZ and YAZ++ directories
 YAZ_DIR=..\..\yaz
-YAZPP_DIR=..\..\yaz++
+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_LIB_SUFFIX=$(BOOST_TOOLSET)-mt-$(BOOST_VERSION).lib
 
 # libxml2 + libxslt + associates
 ZLIB_DIR=\zlib-1.2.3.win32
@@ -27,12 +32,12 @@ default: all
 
 all: dirs config yaz yazpp libxslt dll progs
 
-progs: ex_filter_frontend_net test_pipe yp2
+progs: ex_filter_frontend_net test_pipe metaproxy
 
 NSIS="c:\program files\nsis\makensis.exe"
 
 nsis: all
-       $(NSIS) yp2.nsi
+       $(NSIS) metaproxy.nsi
 
 # Directories
 # The current directory is supposed to be something like
@@ -53,16 +58,16 @@ TMP=$(TMPDIR)
 ############### Targets - what to make
 ###########################################################
 
-PROJECT_DLL=$(BINDIR)\yp2.dll
-PROJECT_IMPLIB=$(LIBDIR)\yp2.lib
+PROJECT_DLL=$(BINDIR)\metaproxy.dll
+PROJECT_IMPLIB=$(LIBDIR)\metaproxy.lib
 EX_FILTER_FRONTEND_NET=$(BINDIR)\ex_filter_frontend_net.exe
-YP2_PROG=$(BINDIR)\yp2.exe
+METAPROXY_PROG=$(BINDIR)\metaproxy.exe
 TEST_PIPE=$(BINDIR)\test_pipe.exe
 
 # shortcut names defined here
 dll: $(PROJECT_DLL)
 ex_filter_frontend_net: $(EX_FILTER_FRONTEND_NET)
-yp2: $(YP2_PROG)
+metaproxy: $(METAPROXY_PROG)
 test_pipe: $(TEST_PIPE)
 
 ###########################################################
@@ -92,6 +97,7 @@ 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 +108,12 @@ $(SRCDIR)\config.hpp:
 
 # Boost 
 #
-BOOST_DEF = /I"$(BOOST)\include\boost-$(BOOSTVER)"
+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 +127,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)\\"        \
@@ -223,7 +229,7 @@ PROJECT_DLL_OBJS = \
         $(OBJDIR)\xmlutil.obj 
 
 EX_FILTER_FRONTEND_NET_OBJS = $(OBJDIR)\ex_filter_frontend_net.obj
-YP2_OBJS = $(OBJDIR)\yp2_prog.obj
+METAPROXY_OBJS = $(OBJDIR)\metaproxy_prog.obj
 TEST_PIPE_OBJS = $(OBJDIR)\test_pipe.obj
 
 ###########################################################
@@ -246,8 +252,8 @@ COMMON_RC_OPTIONS= /l 0x406 /i"$(ROOTDIR)"
 DEBUG_RC_OPTIONS=/d "_DEBUG"
 RELEASE_RC_OPTIONS=/d "NDEBUG"
 
-PROJECT_RES=$(OBJDIR)\yp2.res
-PROJECT_RC=$(WINDIR)\yp2.rc
+PROJECT_RES=$(OBJDIR)\metaproxy.res
+PROJECT_RC=$(WINDIR)\metaproxy.rc
 
 !if $(DEBUG)
 RSOPT=/d_DEBUG
@@ -270,9 +276,9 @@ $(EX_FILTER_FRONTEND_NET) : "$(BINDIR)" $(EX_FILTER_FRONTEND_NET_OBJS) $(PROJECT
        @echo Linking $(EX_FILTER_FRONTEND_NET)
        $(LINK) $(LNKOPT) $(PROG_LINK_OPTIONS) $(LINK_LIBS) $(PROJECT_DLL_OBJS) $(EX_FILTER_FRONTEND_NET_OBJS) /out:$(EX_FILTER_FRONTEND_NET) 
 
-$(YP2_PROG) : "$(BINDIR)" $(YP2_OBJS) $(PROJECT_IMPLIB)
-       @echo Linking $(YP2_PROG)
-       $(LINK) $(LNKOPT) $(PROG_LINK_OPTIONS) $(LINK_LIBS) $(PROJECT_DLL_OBJS) $(YP2_OBJS) /out:$(YP2_PROG) 
+$(METAPROXY_PROG) : "$(BINDIR)" $(METAPROXY_OBJS) $(PROJECT_IMPLIB)
+       @echo Linking $(METAPROXY_PROG)
+       $(LINK) $(LNKOPT) $(PROG_LINK_OPTIONS) $(LINK_LIBS) $(PROJECT_DLL_OBJS) $(METAPROXY_OBJS) /out:$(METAPROXY_PROG) 
 
 $(TEST_PIPE) : "$(BINDIR)" $(TEST_PIPE_OBJS) $(PROJECT_IMPLIB)
        @echo Linking $(TEST_PIPE)