X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3beb50e570f1b4f7a97c767677451ffc558fa22f..3c3b6f606364ae8bd86eeeb3e129636c5294ea85:/build/bakefiles/common.bkl?ds=sidebyside diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 8de09ff2a7..db792b410b 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -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,8 +180,8 @@ $(mk.evalExpr(wxwin.mkLibName('stc'))) - - $(mk.evalExpr(wxwin.mkLibName('web'))) + + $(mk.evalExpr(wxwin.mkLibName('webview'))) $(mk.evalExpr(wxwin.mkLibName('mono'))) @@ -173,14 +192,6 @@ - - _$(CPU) - _amd64 - _amd64 - _ia64 - _ia64 - - dll @@ -194,7 +205,7 @@ $(COMPILER) - $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) + $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(CFG_NAME_PART)$(ARCH_SUFFIX) $(OBJS) @@ -210,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) @@ -309,6 +320,8 @@ /MACHINE:X64 /MACHINE:IA64 /MACHINE:IA64 + /MACHINE:X64 + /MACHINE:X64