Linking with the TIFF library

[wxWidgets.git] / src / zlib / makefile.vc

diff --git a/src/zlib/makefile.vc b/src/zlib/makefile.vc
index 1af77a34f4afda414fdbebb7fc855891b8505fe7..283ea06376e5ff31e8837519eac9c5206f159775 100644 (file)
--- a/src/zlib/makefile.vc
+++ b/src/zlib/makefile.vc
@@ -15,11 +15,18 @@ FINAL=0
 !endif
 
 !if "$(FINAL)" == "0"
 !endif
 
 !if "$(FINAL)" == "0"

-CFLAGS=/Od /MDd /GX
+CFLAGS=/Od $(CRTFLAG) /GX
+_CRTFLAG=/MDd

 !else
 !else

-CFLAGS=-O2 /MD /GX
+CFLAGS=-O2 $(CRTFLAG) /GX
+_CRTFLAG=/MD

 !endif
 
 !endif
 

+!if "$(CRTFLAG)" == ""
+CRTFLAG=$(_CRTFLAG)
+!endif
+
+

 CC=cl
 LD=cl
 LIB=tlib
 CC=cl
 LD=cl
 LIB=tlib


@@ -31,9 +38,9 @@ LIBTARGET=..\..\lib\zlib.lib
 
 # variables
 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
 
 # variables
 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \

-  trees$(O) 
+  trees$(O)

 OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
 OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \

-  infutil$(O) inffast$(O) 
+  infutil$(O) inffast$(O)

 
 all: $(LIBTARGET)
 
 
 all: $(LIBTARGET)
 


@@ -84,7 +91,7 @@ zutil.obj: zutil.c zutil.h zlib.h zconf.h
 LIBOBJECTS = $(OBJ1) $(OBJ2)
 
 $(LIBTARGET): $(LIBOBJECTS)
 LIBOBJECTS = $(OBJ1) $(OBJ2)
 
 $(LIBTARGET): $(LIBOBJECTS)

-        del $(LIBTARGET)
+        -del $(LIBTARGET)

         lib @<<
 -out:$(LIBTARGET)
 $(LIBOBJECTS)
         lib @<<
 -out:$(LIBTARGET)
 $(LIBOBJECTS)