Replaced 'erase' with $(RM) so that the default file deletion program can be overriden

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

diff --git a/src/png/makefile.nt b/src/png/makefile.nt
index 4973db4f38a7dfe484e4b67166b5e42f3052e2f5..ab823c8fc95c623491b7df5af9fc5863677f83ec 100644 (file)
--- a/src/png/makefile.nt
+++ b/src/png/makefile.nt
@@ -20,6 +20,8 @@ WINPNGLIB = ..\..\lib\winpng.lib
 
 INC = /I..\zlib
 
+FINAL=1
+
 # Set this to nothing if your compiler is MS C++ 7
 ZOPTION=
 
@@ -31,14 +33,14 @@ PRECOMP=/YuWX.H
 
 !if "$(FINAL)" == "0"
 OPT = /Od
-CPPFLAGS= /W4 /Zi /MDd /GX $(ZOPTION) $(OPT) /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch
-CFLAGS= /W4 /Zi /MDd /GX /Od /Dwx_msw $(INC)
+CPPFLAGS= /W4 /Zi /MD /GX- $(ZOPTION) $(OPT) /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch
+CFLAGS= /W4 /Zi /MD /GX- /Od /Dwx_msw $(INC)
 LINKFLAGS=/NOD /CO /ONERROR:NOEXE
 !else
 # /Ox for real FINAL version
 OPT = /O2
-CPPFLAGS= /W4 /MDd /GX /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch
-CFLAGS= /W4 /MDd /GX /Dwx_msw $(INC)
+CPPFLAGS= /W4 /MD /GX- /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch
+CFLAGS= /W4 /MD /GX- /Dwx_msw $(INC)
 LINKFLAGS=/NOD /ONERROR:NOEXE
 !endif
 
@@ -59,6 +61,8 @@ $(OBJECTS)
   cl -DWIN32 $(OPT) $(CFLAGS) /c $*.c
 
 clean:
-        erase *.obj *.exe *.lib
+        erase *.obj
+        erase *.exe
+        erase *.lib
 
 cleanall:      clean