X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc8953a695edc33b100378a3334738a94d1aa9f6..982a0fcd289b60a8f673c8bc2825dd9b4eac2218:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 410524ddb6..240c344f95 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -3,7 +3,7 @@ - + @@ -22,10 +22,6 @@ 0 - - 0 - - @@ -61,16 +57,20 @@ _$(VENDOR) + - d - d + d + d u + + $(WXUNICODEFLAG)$(WXDEBUGFLAG) + - $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) + $(WX_U_D_SUFFIX)$(WX_LIB_FLAVOUR) @@ -145,13 +145,21 @@ $(mk.evalExpr(wxwin.mkLibName('aui'))) + + $(mk.evalExpr(wxwin.mkLibName('ribbon'))) + + + $(mk.evalExpr(wxwin.mkLibName('propgrid'))) + $(mk.evalExpr(wxwin.mkLibName('richtext'))) $(mk.evalExpr(wxwin.mkLibName('stc'))) - + + $(mk.evalExpr(wxwin.mkLibName('webview'))) + $(mk.evalExpr(wxwin.mkLibName('mono'))) @@ -174,10 +182,10 @@ dll - $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + $(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG) - $(COMPILER) @@ -204,7 +212,7 @@ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX) @@ -254,9 +262,13 @@ - __WXDEBUG__ - __WXDEBUG__ + wxDEBUG_LEVEL=0 + + + NDEBUG + NDEBUG + __NO_VC_CRTDBG__ @@ -278,19 +290,19 @@ unicows - - - - gdiplus - - - wxUSE_GRAPHICS_CONTEXT=1 - - + + cairo + + + $(DOLLAR)(CAIRO_ROOT)/lib + + + $(DOLLAR)(CAIRO_ROOT)/include/cairo + - /MACHINE:AMD64 - /MACHINE:AMD64 + /MACHINE:X64 + /MACHINE:X64 /MACHINE:IA64 /MACHINE:IA64 @@ -306,15 +318,15 @@ $(EXTRACFLAGS) + + + _CRT_SECURE_NO_DEPRECATE=1 + _CRT_NON_CONFORMING_SWPRINTFS=1 + _SCL_SECURE_NO_WARNINGS=1 + + $(NO_VC_CRTDBG) $(WIN32_WINNT) - - - $(_ldlibs.replace('ccrtrtti.lib', '')) - $(_cppflags.replace('/GR', '')) - $(LINK_TARGET_CPU) @@ -328,7 +340,7 @@ @@ -353,7 +381,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 @@ -450,7 +485,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) @@ -458,31 +493,21 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(EXTRALIBS_GUI) - - $(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10 - - dos4gw - - - + + $(LIB_PNG) +