X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3156ba6ea663e020b1a3ad3646ee48c885d8b736..aa44b2611555154a92fb02c9193eed599319bea4:/src/png/makefile.vc

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index bd797dfff5..cf5e9f3af6 100644
--- a/src/png/makefile.vc
+++ b/src/png/makefile.vc
@@ -14,7 +14,14 @@ WXDIR = $(WXWIN)
 
 WINPNGDIR = ..\png
 WINPNGINC = $(WINPNGDIR)
-WINPNGLIB = ..\..\lib\winpng.lib
+
+!if "$(FINAL)" == "1"
+WINPNGLIB=..\..\lib\png.lib
+!else if "$(FINAL)" == "hybrid"
+WINPNGLIB=..\..\lib\pngh.lib
+!else
+WINPNGLIB=..\..\lib\pngd.lib
+!endif
 
 INC = /I..\zlib
 
@@ -33,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)" == ""
@@ -66,6 +79,6 @@ $(OBJECTS)
 clean:
         -erase *.obj
         -erase *.exe
-        -erase *.lib
+        -erase $(WINPNGLIB)
 
 cleanall:	clean