X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9dab58b103502c8b4ed160e3573e6bc971960c7c..9e1da4827a0ec18f9766d664b9af12c25e3f71fb:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 56082c5145..db792b410b 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -3,7 +3,7 @@ - + @@ -22,10 +22,6 @@ 0 - - 0 - - @@ -34,6 +30,15 @@ + + _$(CPU) + _x64 + _x64 + _ia64 + _ia64 + _x64 + _x64 + @@ -48,12 +53,26 @@ _carbon + + + ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD + + $(COMPILER) gcc + + - _$(COMPILERORGCC) + _$(COMPILERORGCC)$(COMPILER_VERSION)$(ARCH_SUFFIX) + _$(COMPILERORGCC) @@ -161,7 +180,9 @@ $(mk.evalExpr(wxwin.mkLibName('stc'))) - + + $(mk.evalExpr(wxwin.mkLibName('webview'))) + $(mk.evalExpr(wxwin.mkLibName('mono'))) @@ -171,14 +192,6 @@ - - _$(CPU) - _amd64 - _amd64 - _ia64 - _ia64 - - dll @@ -187,12 +200,12 @@ $(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(WXDLLFLAG)$(CFG) - $(COMPILER) - $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) + $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(CFG_NAME_PART)$(ARCH_SUFFIX) $(OBJS) @@ -208,7 +221,7 @@ $(wx_top_builddir)/lib - $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) @@ -266,6 +279,11 @@ wxDEBUG_LEVEL=0 + + NDEBUG + NDEBUG + + __NO_VC_CRTDBG__ @@ -287,21 +305,23 @@ 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 + /MACHINE:X64 + /MACHINE:X64 @@ -361,7 +398,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 @@ -397,7 +441,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h univ/setup.h - + $(msvc_copy_setup_h_script % 'msw\setup.h') @@ -458,7 +502,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) @@ -466,31 +510,21 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r $(EXTRALIBS_GUI) - - $(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10 - - dos4gw - - - + + $(LIB_PNG) +