X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ece421c6c40b0977dc2a7f91f9eff7234b814dd..ab451f970cda6d9f3f177b034b055743670b713f:/samples/wrapsizer/makefile.vc diff --git a/samples/wrapsizer/makefile.vc b/samples/wrapsizer/makefile.vc index 478eadd22b..1b54284f9d 100644 --- a/samples/wrapsizer/makefile.vc +++ b/samples/wrapsizer/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.4 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -40,10 +40,10 @@ PORTNAME = base !if "$(USE_GUI)" == "1" PORTNAME = msw !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" WXDEBUGFLAG = d !endif -!if "$(DEBUG_FLAG)" == "1" +!if "$(DEBUG_RUNTIME_LIBS)" == "1" WXDEBUGFLAG = d !endif !if "$(UNICODE)" == "1" @@ -199,17 +199,11 @@ __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -__DEBUG_DEFINE_p = /D__WXDEBUG__ -!endif -!if "$(DEBUG_FLAG)" == "1" -__DEBUG_DEFINE_p = /D__WXDEBUG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" -__DEBUG_DEFINE_p_1 = /d __WXDEBUG__ +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 !endif -!if "$(DEBUG_FLAG)" == "1" -__DEBUG_DEFINE_p_1 = /d __WXDEBUG__ +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 !endif !if "$(USE_EXCEPTIONS)" == "0" __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS @@ -306,7 +300,7 @@ clean: $(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample.res link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wrapsizer.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(WRAPSIZER_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib + $(WRAPSIZER_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib << $(OBJS)\wrapsizer_sample.res: .\..\..\samples\sample.rc