X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15b44c69ab89cd6e5f2c3fa28377f5a4fadcbad6..bd018e7e31361bc2112a386f18663908a0559d58:/build/bakefiles/common.bkl?ds=inline diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 3ba7c9369c..bebeca6399 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -2,29 +2,71 @@ - + + + + + + + + + 0 + + + + 0 + - - + + + - + $(wxwin.getVersionMajor()) $(wxwin.getVersionMinor()) $(wxwin.getVersionRelease()) - $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE) + + $(WXVER_MAJOR).$(WXVER_MINOR) + + + $(WXVER_MAJOR)$(WXVER_MINOR) + + + $(WX_RELEASE).$(WXVER_RELEASE) + + + $(WX_RELEASE_NODOT)$(WXVER_RELEASE) + - 0.0.0 - $(WX_VERSION) - + $(int(int(WXVER_MINOR) % 2 == 0)) + + + 0 + + $(WX_BINARY_VERSION).0.0 + $(WXVER_RELEASE).0.0 + + $(WX_VERSION) + + $(WX_RELEASE_NODOT) + $(WX_VERSION_NODOT) + + + @@ -34,6 +76,10 @@ $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) + + _carbon + + $(COMPILER) gcc @@ -48,15 +94,17 @@ - d + d + d - u + + u - $(WXUNICODEFLAG)$(WXDEBUGFLAG) + $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) - + univ @@ -65,22 +113,27 @@ - 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) - wx$(WXVER_MAJOR)$(WXVER_MINOR) + + wxbase$(WXBASEPORT)$(WXWIN32DLLVERSION) + $(WXNAMEPREFIX) - wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR) + wx$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION) $(WXNAMEPREFIXGUI) @@ -89,11 +142,7 @@ $(WXVERSIONTAG) - - $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR) - - @@ -101,22 +150,51 @@ $(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) + @@ -125,58 +203,192 @@ $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - objs_$(COMPILER)_$(CFG_NAME_PART) + + + $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) + + + build_cbx_$(CFG_NAME_PART) + + $(OBJS) - - + + + lib + dll + + + $(top_builddir)lib - $(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART) + $(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 off speed + + on + off + + + on + off + + + multi + single + + + + wxNO_RTTI + + + wxNO_EXCEPTIONS + + + wxNO_THREADS + - __WXDEBUG__ + __WXDEBUG__ + __WXDEBUG__ + + + + __NO_VC_CRTDBG__ + __NO_VC_CRTDBG__ - wxUSE_UNICODE=1 + _UNICODE - + + + + _WIN32_WINNT=0x0400 + + + + unicows + + + + -