X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/679eea8dec92f8bc0bf30640ad9d7a0cb8f1c430..cb751f46a0db6efd12b1e8f9d1074e71b6249253:/build/bakefiles/common.bkl?ds=sidebyside diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 0158fc2e47..89080fa27e 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -3,7 +3,7 @@ - + @@ -25,41 +25,14 @@ 0 + - - - - - $(wxwin.getVersionMajor()) - $(wxwin.getVersionMinor()) - $(wxwin.getVersionRelease()) - - $(WXVER_MAJOR).$(WXVER_MINOR) - - - $(WXVER_MAJOR)$(WXVER_MINOR) - - - $(WX_RELEASE).$(WXVER_RELEASE) - - - $(WX_RELEASE_NODOT)$(WXVER_RELEASE) - - - $(int(int(WXVER_MINOR) % 2 == 0)) - - 0.0.0 - $(WXVER_RELEASE).0.0 - - $(WX_VERSION) - - $(WX_RELEASE_NODOT) - $(WX_VERSION_NODOT) - + + @@ -148,6 +121,9 @@ $(mk.evalExpr(wxwin.mkLibName('net'))) + + $(mk.evalExpr(wxwin.mkLibName('qa'))) + $(mk.evalExpr(wxwin.mkLibName('core'))) @@ -155,7 +131,7 @@ $(mk.evalExpr(wxwin.mkLibName('adv'))) - $(mk.evalExpr(wxwin.mkLibName('media'))) + $(mk.evalExpr(wxwin.mkLibName('media'))) $(mk.evalExpr(wxwin.mkLibName('html'))) @@ -166,13 +142,14 @@ $(mk.evalExpr(wxwin.mkLibName('xrc'))) - - - $(mk.evalExpr(wxwin.mkLibName('odbc'))) - + + $(mk.evalExpr(wxwin.mkLibName('aui'))) + + + $(mk.evalExpr(wxwin.mkLibName('richtext'))) - - $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) + + $(mk.evalExpr(wxwin.mkLibName('stc'))) @@ -186,6 +163,10 @@ _$(CPU) + _amd64 + _amd64 + _ia64 + _ia64 @@ -195,27 +176,29 @@ $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + $(COMPILER) + - - $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) - - - build_cbx_$(CFG_NAME_PART) + $(COMPILER_PREFIX)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) $(OBJS) - lib - dll + lib + dll + $(TOOLKIT_LOWERCASE)_lib + $(TOOLKIT_LOWERCASE)_dll - $(top_builddir)lib + $(wx_top_builddir)/lib - $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) @@ -238,7 +221,8 @@ off - $(DEBUGINFO) + on + off off on @@ -259,6 +243,16 @@ single + + wxNO_RTTI + + + wxNO_EXCEPTIONS + + + wxNO_THREADS + + __WXDEBUG__ __WXDEBUG__ @@ -270,6 +264,10 @@ _UNICODE + wxUSE_UNICODE=0 + + + wxUSE_UNICODE_MSLU=1 @@ -281,6 +279,22 @@ unicows + + + gdiplus + + + wxUSE_GRAPHICS_CONTEXT=1 + + + + + /MACHINE:AMD64 + /MACHINE:AMD64 + /MACHINE:IA64 + /MACHINE:IA64 + +