added an error message if a bitmap can't be addedto the image list

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

diff --git a/src/png/makefile.nt b/src/png/makefile.nt
index 5e53a15a41da132f373b44df918cf090f03fb92a..a4c8b19d4be52c611076c60b563c013609270657 100644 (file)
--- a/src/png/makefile.nt
+++ b/src/png/makefile.nt
@@ -16,7 +16,7 @@ WXINC = $(WXDIR)\include
 
 WINPNGDIR = ..\png
 WINPNGINC = $(WINPNGDIR)
 
 WINPNGDIR = ..\png
 WINPNGINC = $(WINPNGDIR)

-WINPNGLIB = ..\..\..\lib\winpng.lib
+WINPNGLIB = ..\..\lib\winpng.lib

 
 INC = /I..\zlib
 
 
 INC = /I..\zlib
 


@@ -31,14 +31,14 @@ PRECOMP=/YuWX.H
 
 !if "$(FINAL)" == "0"
 OPT = /Od
 
 !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
 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
 
 LINKFLAGS=/NOD /ONERROR:NOEXE
 !endif
 


@@ -59,6 +59,8 @@ $(OBJECTS)
   cl -DWIN32 $(OPT) $(CFLAGS) /c $*.c
 
 clean:
   cl -DWIN32 $(OPT) $(CFLAGS) /c $*.c
 
 clean:

-        erase *.obj *.exe *.lib
+        erase *.obj
+        erase *.exe
+        erase *.lib

 
 cleanall:      clean
 
 cleanall:      clean