From d604ea33556e3b97b32f11c6dc6bc6bcb1bbcbee Mon Sep 17 00:00:00 2001 From: "Unknown (JL)" Date: Thu, 7 Oct 1999 07:55:08 +0000 Subject: [PATCH] switch /MD /MDd depend on FINAL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/png/makefile.vc | 4 ++-- src/zlib/makefile.vc | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/png/makefile.vc b/src/png/makefile.vc index 5a871b3657..e028f53f0f 100644 --- a/src/png/makefile.vc +++ b/src/png/makefile.vc @@ -29,8 +29,8 @@ PRECOMP=/YuWX.H !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 diff --git a/src/zlib/makefile.vc b/src/zlib/makefile.vc index fa57b5c76b..1af77a34f4 100644 --- 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++ ------------- +!ifndef FINAL +FINAL=0 +!endif + +!if "$(FINAL)" == "0" +CFLAGS=/Od /MDd /GX +!else CFLAGS=-O2 /MD /GX +!endif + CC=cl LD=cl LIB=tlib