added wxGetMultiChoice() (which refuses to work for some reason - will fix

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

diff --git a/src/zlib/makefile.vc b/src/zlib/makefile.vc
index fa57b5c76bf11ee3df2f8cf560272cacd0fca9b3..51b1348b741f0b3878a7c2b8b74725f1cf6c3528 100644 (file)
--- a/src/zlib/makefile.vc
+++ b/src/zlib/makefile.vc
@@ -10,7 +10,26 @@
 # See zconf.h for details about the memory requirements.
 
 # ------------- Turbo C++, Borland C++ -------------
 # See zconf.h for details about the memory requirements.
 
 # ------------- Turbo C++, Borland C++ -------------

-CFLAGS=-O2 /MD /GX
+!ifndef FINAL
+FINAL=0
+!endif
+
+!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
+!endif
+
+!if "$(CRTFLAG)" == ""
+CRTFLAG=$(_CRTFLAG)
+!endif
+
+

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


@@ -18,13 +37,19 @@ LIB=tlib
 LDFLAGS=$(MODEL)
 O=.obj
 
 LDFLAGS=$(MODEL)
 O=.obj
 

+!if "$(FINAL)" == "1"

 LIBTARGET=..\..\lib\zlib.lib
 LIBTARGET=..\..\lib\zlib.lib

+!else if "$(FINAL)" == "hybrid"
+LIBTARGET=..\..\lib\zlibh.lib
+!else
+LIBTARGET=..\..\lib\zlibd.lib
+!endif

 
 # 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)
 


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

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

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