mingw32 compilation fixes (unfortunately, this effectively disables placing controls...

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

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index e028f53f0f5416868f28e76b7e2078657e37d7e5..bd797dfff5783ecf702c2842d58b01bde9e3e557 100644 (file)
--- a/src/png/makefile.vc
+++ b/src/png/makefile.vc
@@ -2,7 +2,7 @@
 # File:                makefile.vc
 # Author:      Julian Smart
 # Created:     1993
-# Updated:     
+# Updated:
 # Copyright:   (c) 1993, AIAI, University of Edinburgh
 #
 # "%W% %G%"
@@ -25,21 +25,28 @@ ZOPTION=
 FINAL=0
 !endif
 
-PRECOMP=/YuWX.H 
+PRECOMP=/YuWX.H
 
 !if "$(FINAL)" == "0"
 OPT = /Od
-CPPFLAGS= /W4 /Zi /MDd /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC)
-CFLAGS= /W4 /Zi /MDd /GX /Od /D__WXMSW__ $(INC)
+CPPFLAGS= /W4 /Zi $(CRTFLAG) /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC)
+CFLAGS= /W4 /Zi $(CRTFLAG) /GX /Od /D__WXMSW__ $(INC)
 LINKFLAGS=/NOD /CO /ONERROR:NOEXE
+_CRTFLAG=/MDd
 !else
 # /Ox for real FINAL version
 OPT = /O2
-CPPFLAGS= /W4 /MD /GX /D__WXMSW__ $(INC)
-CFLAGS= /W4 /MD /GX /D__WXMSW__ $(INC)
+CPPFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC)
+CFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC)
 LINKFLAGS=/NOD /ONERROR:NOEXE
+_CRTFLAG=/MDd
 !endif
 
+!if "$(CRTFLAG)" == ""
+CRTFLAG=$(_CRTFLAG)
+!endif
+
+
 OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
  pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj \
  pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj