X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=9678ae6b4ff3330ee6b6345af5c0e666438f6e2c;hb=2d2beb493e5e90254d553a15477fdf88b73b8068;hp=5056deb28b62d549262ff76b384a860b3dba4b02;hpb=ecf31b727a3af51c89a1aa7b67f6e1265a2ce73f;p=yazpp-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 5056deb..9678ae6 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
-# Copyright (C) 1995-2005, Index Data ApS
+# Copyright (C) 1995-2006, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.9 2005-11-03 14:48:06 adam Exp $
+# $Id: makefile,v 1.14 2006-04-30 09:07:43 adam Exp $
 
 ###########################################################
 ############### Parameters 
@@ -28,7 +28,7 @@ nsishelp:
 ###########################################################
 # The current directory is supposed to be something like
 # ..../yaz/win, everything is relative to that
-ROOTDIR=..   # The home of yaz++
+ROOTDIR=..   # The home of yazpp
 
 INCLDIR=$(ROOTDIR)\include  # our includes
 LIBDIR=$(ROOTDIR)\lib       # We produce .lib, .exp etc there
@@ -45,8 +45,16 @@ TMP=$(TMPDIR)
 ############### Targets - what to make
 ###########################################################
 
+!if $(DEBUG)
+YAZPP_DLL=$(BINDIR)\yazppd.dll
+YAZPP_IMPLIB=$(LIBDIR)\yazppd.lib
+YAZD=yazd
+!else
 YAZPP_DLL=$(BINDIR)\yazpp.dll
 YAZPP_IMPLIB=$(LIBDIR)\yazpp.lib
+YAZD=yaz
+!endif
+
 ZCLIENT=$(BINDIR)\zclient.exe
 MY_CLIENT=$(BINDIR)\yaz-my-client.exe
 
@@ -60,15 +68,16 @@ myclient: $(MY_CLIENT)
 ###########################################################
 
 # YAZ includes & libs
-YAZ_LIB="$(YAZ_DIR)\lib\yaz.lib"
+YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib"
 YAZ_DEF=/I"$(YAZ_DIR)\include"
-yaz: $(BINDIR)\yaz.dll $(BINDIR)\yaz.dll
+yaz: $(BINDIR)\$(YAZD).dll $(BINDIR)\$(YAZD).dll
 
-$(BINDIR)\yaz.dll: $(YAZ_DIR)\bin\yaz.dll
-  copy "$(YAZ_DIR)\bin\yaz.dll" $(BINDIR)
+$(BINDIR)\$(YAZD).dll: $(YAZ_DIR)\bin\$(YAZD).dll
+  copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR)
 
 COMMON_C_OPTIONS=          \
-  /nologo /W3 /GX /FD /c   \
+  /nologo /W3 /EHsc /FD /c \
+  /D "_CRT_SECURE_NO_DEPRECATE" \
   $(YAZ_DEF)               \
   /D "_WINDOWS"            \
   /D "WIN32"               \
@@ -82,7 +91,7 @@ COMMON_C_INCLUDES= \
 
 DEBUG_C_OPTIONS=  \
   /D "_DEBUG"      \
-  /MDd  /Od /YX /Zi /Gm
+  /MDd  /Od /Zi /Gm
 
 RELEASE_C_OPTIONS=  \
   /D "NDEBUG"        \
@@ -99,7 +108,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
@@ -111,7 +119,7 @@ LINK=link.exe
 LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
            advapi32.lib uuid.lib \
            wsock32.lib  advapi32.lib \
-           $(YAZ_LIB) $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
+           $(YAZ_LIB)
 
 COMMON_LNK_OPTIONS= /nologo \
                     /subsystem:windows \
@@ -221,7 +229,6 @@ $(YAZPP_DLL) $(YAZPP_IMPLIB): "$(BINDIR)" $(YAZPP_DLL_OBJS)
 		$(YAZPP_DLL_OBJS)
 		/out:"$(YAZPP_DLL)"
 		/implib:"$(YAZPP_IMPLIB)"
-		/map:"$(LIBDIR)\yazpp.map"  
 <<
 
 $(MY_CLIENT) : "$(BINDIR)" $(MY_CLIENT_OBJS) $(YAZPP_IMPLIB)