X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..28f5082b3235a349ffc3b99eeacca5049ccd42dd:/src/png/makefile.nt diff --git a/src/png/makefile.nt b/src/png/makefile.nt index 5e53a15a41..ab823c8fc9 100644 --- a/src/png/makefile.nt +++ b/src/png/makefile.nt @@ -16,10 +16,12 @@ WXINC = $(WXDIR)\include WINPNGDIR = ..\png WINPNGINC = $(WINPNGDIR) -WINPNGLIB = ..\..\..\lib\winpng.lib +WINPNGLIB = ..\..\lib\winpng.lib INC = /I..\zlib +FINAL=1 + # Set this to nothing if your compiler is MS C++ 7 ZOPTION= @@ -31,14 +33,14 @@ PRECOMP=/YuWX.H !if "$(FINAL)" == "0" OPT = /Od -CPPFLAGS= /W4 /Zi /MDd /GX $(ZOPTION) $(OPT) /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch -CFLAGS= /W4 /Zi /MDd /GX /Od /Dwx_msw $(INC) +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) LINKFLAGS=/NOD /CO /ONERROR:NOEXE !else # /Ox for real FINAL version OPT = /O2 -CPPFLAGS= /W4 /MDd /GX /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch -CFLAGS= /W4 /MDd /GX /Dwx_msw $(INC) +CPPFLAGS= /W4 /MD /GX- /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch +CFLAGS= /W4 /MD /GX- /Dwx_msw $(INC) LINKFLAGS=/NOD /ONERROR:NOEXE !endif @@ -59,6 +61,8 @@ $(OBJECTS) cl -DWIN32 $(OPT) $(CFLAGS) /c $*.c clean: - erase *.obj *.exe *.lib + erase *.obj + erase *.exe + erase *.lib cleanall: clean