merged 2.2 branch

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

diff --git a/src/zlib/makefile.vc b/src/zlib/makefile.vc
index f806ae9f1a5858e0d665b699a4480a5d1608abcb..fdcbbb97c7f0c6bf2e395d2c3bfdaf05e3a601fe 100644 (file)
--- a/src/zlib/makefile.vc
+++ b/src/zlib/makefile.vc
@@ -34,7 +34,11 @@ LIB=tlib
 LDFLAGS=$(MODEL)
 O=.obj
 
+!if "$(FINAL)" == "1"
 LIBTARGET=..\..\lib\zlib.lib
+!else
+LIBTARGET=..\..\lib\zlibd.lib
+!endif
 
 # variables
 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
@@ -91,7 +95,7 @@ zutil.obj: zutil.c zutil.h zlib.h zconf.h
 LIBOBJECTS = $(OBJ1) $(OBJ2)
 
 $(LIBTARGET): $(LIBOBJECTS)
-        del $(LIBTARGET)
+        -erase $(LIBTARGET)
         lib @<<
 -out:$(LIBTARGET)
 $(LIBOBJECTS)