regenerated

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

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index 94244472b839d2b3b617d450424ada06e04c91e0..cf5e9f3af6b681da6426ef3f5b03dbb5dfb07d79 100644 (file)
--- a/src/png/makefile.vc
+++ b/src/png/makefile.vc
@@ -17,6 +17,8 @@ WINPNGINC = $(WINPNGDIR)
 
 !if "$(FINAL)" == "1"
 WINPNGLIB=..\..\lib\png.lib
+!else if "$(FINAL)" == "hybrid"
+WINPNGLIB=..\..\lib\pngh.lib
 !else
 WINPNGLIB=..\..\lib\pngd.lib
 !endif
@@ -38,13 +40,19 @@ 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 if "$(FINAL)" == "hybrid"
+OPT = /Od
+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=/MD
 !else
 # /Ox for real FINAL version
 OPT = /O2
 CPPFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC)
 CFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC)
 LINKFLAGS=/NOD /ONERROR:NOEXE
-_CRTFLAG=/MDd
+_CRTFLAG=/MD
 !endif
 
 !if "$(CRTFLAG)" == ""
@@ -59,7 +67,7 @@ OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
 all:    $(WINPNGLIB)
 
 $(WINPNGLIB):      $(OBJECTS)
-        -del $(WINPNGLIB)
+        -erase $(WINPNGLIB)
         lib @<<
 -out:$(WINPNGLIB)
 $(OBJECTS)
@@ -71,6 +79,6 @@ $(OBJECTS)
 clean:
         -erase *.obj
         -erase *.exe
-        -erase *.lib
+        -erase $(WINPNGLIB)
 
 cleanall:      clean