X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c7447463444c6a6bd910d2706f27c4cd1e4ec1..2f783a23904c7b5057761aedb37ffc27fddb34d8:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 1fa03adc23..2f5855f2cd 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -161,7 +161,9 @@ $(mk.evalExpr(wxwin.mkLibName('stc'))) - + + $(mk.evalExpr(wxwin.mkLibName('webview'))) + $(mk.evalExpr(wxwin.mkLibName('mono'))) @@ -187,7 +189,7 @@ $(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG) - $(COMPILER) @@ -320,6 +322,13 @@ $(EXTRACFLAGS) + + + _CRT_SECURE_NO_DEPRECATE=1 + _CRT_NON_CONFORMING_SWPRINTFS=1 + _SCL_SECURE_NO_WARNINGS=1 + + $(NO_VC_CRTDBG) $(WIN32_WINNT) @@ -376,7 +385,14 @@ - + +Creating $(SETUPHDIR)\wx\setup.h +InputPath=..\..\include\wx\%s + +"$(SETUPHDIR)\wx\setup.h" : +$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h + + Creating $(SETUPHDIR)\wx\setup.h InputPath=..\..\include\wx\%s @@ -473,7 +489,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r The variables below are defined so that all libs are used in monolithic build, but not in multilib one. --> - $(EXTRALIBS) $(EXTRALIBS_GUI) + $(EXTRALIBS) $(EXTRALIBS_XML) $(EXTRALIBS_GUI) $(EXTRALIBS)