X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c4293cb91327247ad69e6ec8d589bfaa299db28..3c3b6f606364ae8bd86eeeb3e129636c5294ea85:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index f2abec66fd..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) @@ -61,16 +80,20 @@ _$(VENDOR) + - d - d + d + d u + + $(WXUNICODEFLAG)$(WXDEBUGFLAG) + - $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) + $(WX_U_D_SUFFIX)$(WX_LIB_FLAVOUR) @@ -145,6 +168,9 @@ $(mk.evalExpr(wxwin.mkLibName('aui'))) + + $(mk.evalExpr(wxwin.mkLibName('ribbon'))) + $(mk.evalExpr(wxwin.mkLibName('propgrid'))) @@ -154,7 +180,9 @@ $(mk.evalExpr(wxwin.mkLibName('stc'))) - + + $(mk.evalExpr(wxwin.mkLibName('webview'))) + $(mk.evalExpr(wxwin.mkLibName('mono'))) @@ -164,28 +192,20 @@ - - _$(CPU) - _amd64 - _amd64 - _ia64 - _ia64 - - dll - $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + $(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) @@ -201,13 +221,13 @@ $(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) - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX) @@ -257,9 +277,13 @@ - __WXDEBUG__ - __WXDEBUG__ + wxDEBUG_LEVEL=0 + + + NDEBUG + NDEBUG + __NO_VC_CRTDBG__ @@ -281,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