X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48d1144bc4dabb9f8dd6f913e9a65d709e5995e3..617ec45690c340d059726a09ccfe4bab9a42d82e:/src/png/makefile.vc?ds=sidebyside diff --git a/src/png/makefile.vc b/src/png/makefile.vc index a4c8b19d4b..bd797dfff5 100644 --- a/src/png/makefile.vc +++ b/src/png/makefile.vc @@ -1,8 +1,8 @@ # -# File: makefile.nt +# File: makefile.vc # Author: Julian Smart # Created: 1993 -# Updated: +# Updated: # Copyright: (c) 1993, AIAI, University of Edinburgh # # "%W% %G%" @@ -11,8 +11,6 @@ # Change WXDIR or WXWIN to wherever wxWindows is found WXDIR = $(WXWIN) -WXLIB = $(WXDIR)\lib\wx.lib -WXINC = $(WXDIR)\include WINPNGDIR = ..\png WINPNGINC = $(WINPNGDIR) @@ -27,21 +25,28 @@ ZOPTION= FINAL=0 !endif -PRECOMP=/YuWX.H +PRECOMP=/YuWX.H !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 $(CRTFLAG) /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC) +CFLAGS= /W4 /Zi $(CRTFLAG) /GX /Od /D__WXMSW__ $(INC) LINKFLAGS=/NOD /CO /ONERROR:NOEXE +_CRTFLAG=/MDd !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 $(CRTFLAG) /GX /D__WXMSW__ $(INC) +CFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC) LINKFLAGS=/NOD /ONERROR:NOEXE +_CRTFLAG=/MDd !endif +!if "$(CRTFLAG)" == "" +CRTFLAG=$(_CRTFLAG) +!endif + + OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \ pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj \ pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj @@ -49,7 +54,7 @@ OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \ all: $(WINPNGLIB) $(WINPNGLIB): $(OBJECTS) - erase $(WINPNGLIB) + -erase $(WINPNGLIB) lib @<< -out:$(WINPNGLIB) $(OBJECTS) @@ -59,8 +64,8 @@ $(OBJECTS) cl -DWIN32 $(OPT) $(CFLAGS) /c $*.c clean: - erase *.obj - erase *.exe - erase *.lib + -erase *.obj + -erase *.exe + -erase *.lib cleanall: clean