X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb8bbc13259cad5d7604985a23213b6c00c19fd8..bed0b9a68871026165fa2d3a4324b0199ed7718a:/build/bakefiles/common.bkl?ds=sidebyside diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 864e8f49e3..bd4ac24a21 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -19,10 +19,21 @@ $(wxwin.getVersionMajor()) $(wxwin.getVersionMinor()) $(wxwin.getVersionRelease()) - $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE) + + $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE) + + + $(int(int(WXVER_MINOR) % 2 == 0)) - 0.0.0 + + 0.0.0 + $(WXVER_RELEASE).0.0 + $(WX_VERSION) + + $(WXVER_MAJOR)$(WXVER_MINOR) + $(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE) + @@ -33,6 +44,10 @@ base $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) + + + _carbon + $(COMPILER) @@ -48,7 +63,8 @@ - d + d + d u @@ -65,22 +81,27 @@ - wx + wx_base$(WXBASEPORT) wx_$(PORTNAME)$(WXUNIVNAME) -$(WXVER_MAJOR).$(WXVER_MINOR) - wx$(WXVER_MAJOR)$(WXVER_MINOR) - wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR) + + wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR) + + + wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR) - wx$(WXVER_MAJOR)$(WXVER_MINOR) + + wxbase$(WXBASEPORT)$(WXWIN32DLLVERSION) + $(WXNAMEPREFIX) - wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR) + wx$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION) $(WXNAMEPREFIXGUI) @@ -89,10 +110,6 @@ $(WXVERSIONTAG) - - $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR) - - @@ -101,12 +118,27 @@ $(mk.evalExpr(wxwin.mkLibName('base'))) + + $(mk.evalExpr(wxwin.mkLibName('net'))) + $(mk.evalExpr(wxwin.mkLibName('core'))) + + $(mk.evalExpr(wxwin.mkLibName('adv'))) + $(mk.evalExpr(wxwin.mkLibName('html'))) + + $(mk.evalExpr(wxwin.mkLibName('xml'))) + + + $(mk.evalExpr(wxwin.mkLibName('odbc'))) + + + $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) + $(mk.evalExpr(wxwin.mkLibName('mono'))) @@ -125,57 +157,95 @@ $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - objs_$(COMPILER)_$(CFG_NAME_PART) + $(COMPILER)_$(CFG_NAME_PART) $(OBJS) - + $(top_builddir)lib - - $(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART) + + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_lib$(CFG) + + + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_dll$(CFG) + + + + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) + + + - - on - off + + on + on + off + off + + + $(DEBUGINFO) + off + on off speed + + on + off + - __WXDEBUG__ + __WXDEBUG__ + __WXDEBUG__ + + + + __NO_VC_CRTDBG__ + __NO_VC_CRTDBG__ - wxUSE_UNICODE=1 + _UNICODE -