buttons now become default when they have focus

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

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index 9094b9ee13f4fefc0901858254a002c229e55762..cd9345debc1bd960141c51a8ef521de41f3aa733 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)
 
 # Change WXDIR or WXWIN to wherever wxWindows is found
 WXDIR = $(WXWIN)

-WXLIB = $(WXDIR)\lib\wx.lib
-WXINC = $(WXDIR)\include

 
 WINPNGDIR = ..\png
 WINPNGINC = $(WINPNGDIR)
 
 WINPNGDIR = ..\png
 WINPNGINC = $(WINPNGDIR)


@@ -31,14 +29,14 @@ PRECOMP=/YuWX.H
 
 !if "$(FINAL)" == "0"
 OPT = /Od
 
 !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 /MD /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC)
+CFLAGS= /W4 /Zi /MD /GX /Od /D__WXMSW__ $(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 /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
 
 LINKFLAGS=/NOD /ONERROR:NOEXE
 !endif
 


@@ -49,7 +47,7 @@ OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
 all:    $(WINPNGLIB)
 
 $(WINPNGLIB):      $(OBJECTS)
 all:    $(WINPNGLIB)
 
 $(WINPNGLIB):      $(OBJECTS)

-        erase $(WINPNGLIB)
+        -erase $(WINPNGLIB)

         lib @<<
 -out:$(WINPNGLIB)
 $(OBJECTS)
         lib @<<
 -out:$(WINPNGLIB)
 $(OBJECTS)