X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66fc790841d813a400edd2b9ab8d400c3966cf7b..bd018e7e31361bc2112a386f18663908a0559d58:/build/bakefiles/common.bkl?ds=inline diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 3543c6ca0c..bebeca6399 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -2,8 +2,8 @@ - - 0 + + @@ -11,22 +11,62 @@ + + + + + + 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) + + + @@ -36,6 +76,10 @@ $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) + + _carbon + + $(COMPILER) gcc @@ -43,17 +87,24 @@ _$(COMPILERORGCC) - + + + + _$(VENDOR) + + - d + d + d - u + + u - $(WXUNICODEFLAG)$(WXDEBUGFLAG) + $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) - + univ @@ -61,15 +112,37 @@ __WXUNIVERSAL__ - wx - wx_$(PORTNAME)$(WXUNIVNAME) - -$(WXVER_MAJOR).$(WXVER_MINOR) - - - $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR) + + wx_base$(WXBASEPORT) + wx_$(PORTNAME)$(WXUNIVNAME) + -$(WX_RELEASE) + + + + wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT) + + + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT) + + + + + wxbase$(WXBASEPORT)$(WXWIN32DLLVERSION) + + $(WXNAMEPREFIX) + + + + wx$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION) + + $(WXNAMEPREFIXGUI) + + + + $(WXVERSIONTAG) - + @@ -77,33 +150,245 @@ $(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) + + + + + dll + + + $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + + + + $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) + + + build_cbx_$(CFG_NAME_PART) + + + $(OBJS) + + + + lib + dll + + + $(top_builddir)lib - $(WXTOPDIR)lib$(DIRSEP)$(COMPILER) + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) + + + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) + + + + + + + + + + + on + on + off + off + + + on + off + off + on + + + off + speed + + + on + off + + + on + off + + + multi + single + + + + wxNO_RTTI + + + wxNO_EXCEPTIONS + + + wxNO_THREADS + + + + __WXDEBUG__ + __WXDEBUG__ + + + + __NO_VC_CRTDBG__ + __NO_VC_CRTDBG__ + + + _UNICODE + + + + + _WIN32_WINNT=0x0400 + + + + unicows + + + + + + + + + + + + $(FORMAT in ['msvc6prj','msevc4prj']) + + + + + + + $(addPrefixToList('include\', wxwin.headersOnly(value))) + + + + + $(addPrefixToList('include\\', wxwin.headersOnly(value))) + + + + + + + + wx/msw/wince/setup.h + wince\setup.h + wince_setup_h + + + wx/msw/setup.h + setup.h + setup_h + + + + include\wx\msw\$(vc_setup_h) + + +Creating $(SETUPHDIR)\wx\setup.h +InputPath=..\include\wx\msw\$(vc_setup_h) + +"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" +$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h + + + + + + - + @@ -111,58 +396,291 @@ + + - - + - - -