regenerated

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

diff --git a/src/zlib/makefile.vc b/src/zlib/makefile.vc
index 5c195c82b420d7fe565905740b946c1111a14eb2..51b1348b741f0b3878a7c2b8b74725f1cf6c3528 100644 (file)
--- a/src/zlib/makefile.vc
+++ b/src/zlib/makefile.vc
@@ -17,6 +17,9 @@ FINAL=0
 !if "$(FINAL)" == "0"
 CFLAGS=/Od $(CRTFLAG) /GX
 _CRTFLAG=/MDd
+!else if "$(FINAL)" == "hybrid"
+CFLAGS=/Od $(CRTFLAG) /GX
+_CRTFLAG=/MD
 !else
 CFLAGS=-O2 $(CRTFLAG) /GX
 _CRTFLAG=/MD
@@ -36,6 +39,8 @@ O=.obj
 
 !if "$(FINAL)" == "1"
 LIBTARGET=..\..\lib\zlib.lib
+!else if "$(FINAL)" == "hybrid"
+LIBTARGET=..\..\lib\zlibh.lib
 !else
 LIBTARGET=..\..\lib\zlibd.lib
 !endif
@@ -95,7 +100,7 @@ zutil.obj: zutil.c zutil.h zlib.h zconf.h
 LIBOBJECTS = $(OBJ1) $(OBJ2)
 
 $(LIBTARGET): $(LIBOBJECTS)
-        -del $(LIBTARGET)
+        -erase $(LIBTARGET)
         lib @<<
 -out:$(LIBTARGET)
 $(LIBOBJECTS)