replaced T() makro with wxT() due to namespace probs, _T() exists, too

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

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index 9094b9ee13f4fefc0901858254a002c229e55762..e028f53f0f5416868f28e76b7e2078657e37d7e5 100644 (file)
--- a/src/png/makefile.vc
+++ b/src/png/makefile.vc
@@ -11,8 +11,6 @@
 
 # Change WXDIR or WXWIN to wherever wxWindows is found
 WXDIR = $(WXWIN)
-WXLIB = $(WXDIR)\lib\wx.lib
-WXINC = $(WXDIR)\include
 
 WINPNGDIR = ..\png
 WINPNGINC = $(WINPNGDIR)
@@ -31,14 +29,14 @@ PRECOMP=/YuWX.H
 
 !if "$(FINAL)" == "0"
 OPT = /Od
-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)
+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
 OPT = /O2
-CPPFLAGS= /W4 /MD /GX /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch
-CFLAGS= /W4 /MD /GX /Dwx_msw $(INC)
+CPPFLAGS= /W4 /MD /GX /D__WXMSW__ $(INC)
+CFLAGS= /W4 /MD /GX /D__WXMSW__ $(INC)
 LINKFLAGS=/NOD /ONERROR:NOEXE
 !endif
 
@@ -49,7 +47,7 @@ OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
 all:    $(WINPNGLIB)
 
 $(WINPNGLIB):      $(OBJECTS)
-        erase $(WINPNGLIB)
+        -erase $(WINPNGLIB)
         lib @<<
 -out:$(WINPNGLIB)
 $(OBJECTS)
@@ -59,8 +57,8 @@ $(OBJECTS)
   cl -DWIN32 $(OPT) $(CFLAGS) /c $*.c
 
 clean:
-        erase *.obj
-        erase *.exe
-        erase *.lib
+        -erase *.obj
+        -erase *.exe
+        -erase *.lib
 
 cleanall:      clean