switch /MD /MDd depend on FINAL

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index 5a871b365713e40a273bd80b551a7da7642b10f0..e028f53f0f5416868f28e76b7e2078657e37d7e5 100644 (file)
--- a/src/png/makefile.vc
+++ b/src/png/makefile.vc
@@ -29,8 +29,8 @@ PRECOMP=/YuWX.H
 
 !if "$(FINAL)" == "0"
 OPT = /Od
 
 !if "$(FINAL)" == "0"
 OPT = /Od

-CPPFLAGS= /W4 /Zi /MD /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC)
-CFLAGS= /W4 /Zi /MD /GX /Od /D__WXMSW__ $(INC)
+CPPFLAGS= /W4 /Zi /MDd /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC)
+CFLAGS= /W4 /Zi /MDd /GX /Od /D__WXMSW__ $(INC)

 LINKFLAGS=/NOD /CO /ONERROR:NOEXE
 !else
 # /Ox for real FINAL version
 LINKFLAGS=/NOD /CO /ONERROR:NOEXE
 !else
 # /Ox for real FINAL version

diff --git a/src/zlib/makefile.vc b/src/zlib/makefile.vc
index fa57b5c76bf11ee3df2f8cf560272cacd0fca9b3..1af77a34f4afda414fdbebb7fc855891b8505fe7 100644 (file)
--- a/src/zlib/makefile.vc
+++ b/src/zlib/makefile.vc
@@ -10,7 +10,16 @@
 # 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++ -------------

+!ifndef FINAL
+FINAL=0
+!endif
+
+!if "$(FINAL)" == "0"
+CFLAGS=/Od /MDd /GX
+!else

 CFLAGS=-O2 /MD /GX
 CFLAGS=-O2 /MD /GX

+!endif
+

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