X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82cb028026ede816b9793bb1fe6df8304f71b6cb..daebb44c74bdbdc8ce43bd4aa471774d92f35f02:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index f882d35246..6efad50fb0 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -2,8 +2,8 @@ - - 0 + + @@ -11,22 +11,29 @@ + + + + + + 0 + + + + 0 + - - - - - - $(wxwin.getVersionMajor()) - $(wxwin.getVersionMinor()) - $(wxwin.getVersionRelease()) - $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE) + + + + + + - 0.0.0 - $(WX_VERSION) - - @@ -36,6 +43,10 @@ $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) + + _carbon + + $(COMPILER) gcc @@ -43,17 +54,24 @@ _$(COMPILERORGCC) - + + + + _$(VENDOR) + + - d + d + d - u + + u - $(WXUNICODEFLAG)$(WXDEBUGFLAG) + $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) - + univ @@ -62,21 +80,36 @@ - wx + wx_base$(WXBASEPORT) wx_$(PORTNAME)$(WXUNIVNAME) - -$(WXVER_MAJOR).$(WXVER_MINOR) + -$(WX_RELEASE) - wx$(WXVER_MAJOR)$(WXVER_MINOR) - wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR) + + wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT) + + + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT) - - - $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR) + + + wxbase$(WXBASEPORT)$(WXWIN32DLLVERSION) + + $(WXNAMEPREFIX) + + + + wx$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION) + + $(WXNAMEPREFIXGUI) + + + + $(WXVERSIONTAG) - + @@ -84,59 +117,316 @@ $(mk.evalExpr(wxwin.mkLibName('base'))) + + $(mk.evalExpr(wxwin.mkLibName('net'))) + + + $(mk.evalExpr(wxwin.mkLibName('qa'))) + $(mk.evalExpr(wxwin.mkLibName('core'))) + + $(mk.evalExpr(wxwin.mkLibName('adv'))) + + + $(mk.evalExpr(wxwin.mkLibName('media'))) + $(mk.evalExpr(wxwin.mkLibName('html'))) + + $(mk.evalExpr(wxwin.mkLibName('xml'))) + + + $(mk.evalExpr(wxwin.mkLibName('xrc'))) + + + + $(mk.evalExpr(wxwin.mkLibName('odbc'))) + + + + $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) + $(mk.evalExpr(wxwin.mkLibName('mono'))) - - + + - + - - + + + _$(CPU) + _amd64 + _amd64 + _ia64 + _ia64 + + + + + dll + + + $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + + $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) + + + build_cbx_$(CFG_NAME_PART) + + + $(OBJS) + + + + lib + dll + $(TOOLKIT_LOWERCASE)_lib + $(TOOLKIT_LOWERCASE)_dll + + + $(top_builddir)lib - $(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER) + + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) + - + + + + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) + + + + + - - on - off + + on + on + off + off + + + on + off + off + on - speed - off + off + speed + + + on + off + + + on + off + + + multi + single + + + + wxNO_RTTI + + + wxNO_EXCEPTIONS + + + wxNO_THREADS + + + + __WXDEBUG__ + __WXDEBUG__ + + + + __NO_VC_CRTDBG__ + __NO_VC_CRTDBG__ + + + _UNICODE + + + wxUSE_UNICODE_MSLU=1 + + + + + _WIN32_WINNT=0x0400 + + + + unicows + + + + /MACHINE:AMD64 + /MACHINE:AMD64 + /MACHINE:IA64 + /MACHINE:IA64 - + + + -