X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fee680be802877ac483e22ee68e3c1957663d0b..f8c5636c42238296eb67bf73d1da3c5acb010fee:/src/png/makefile.vc

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index 61b7be06a5..cf5e9f3af6 100644
--- 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)" == ""