X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1bf307a46cd451f18e012a9d49d2cab2f68f42a..524d97b1c22daf69c57ca92c55ef4bbb206a0943:/build/bakefiles/common.bkl?ds=sidebyside diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index f42611945d..f2abec66fd 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -3,51 +3,38 @@ - - + + + + + + + + 0 + + + + 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) - - - @@ -56,7 +43,7 @@ base $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) - + _carbon @@ -85,7 +72,7 @@ $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) - + univ @@ -123,7 +110,7 @@ $(WXVERSIONTAG) - + @@ -134,12 +121,18 @@ $(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'))) @@ -149,26 +142,34 @@ $(mk.evalExpr(wxwin.mkLibName('xrc'))) - - - $(mk.evalExpr(wxwin.mkLibName('odbc'))) - + + $(mk.evalExpr(wxwin.mkLibName('aui'))) - - $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) + + $(mk.evalExpr(wxwin.mkLibName('propgrid'))) + + + $(mk.evalExpr(wxwin.mkLibName('richtext'))) + + + $(mk.evalExpr(wxwin.mkLibName('stc'))) $(mk.evalExpr(wxwin.mkLibName('mono'))) - - + + - + _$(CPU) + _amd64 + _amd64 + _ia64 + _ia64 @@ -178,36 +179,40 @@ $(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 + $(TOOLKIT_LOWERCASE)_lib + $(TOOLKIT_LOWERCASE)_dll + + - $(top_builddir)lib - - $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_lib$(CFG) - - - $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_dll$(CFG) + $(wx_top_builddir)/lib + + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) - + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) - - + + @@ -219,7 +224,8 @@ off - $(DEBUGINFO) + on + off off on @@ -231,6 +237,24 @@ on off + + on + off + + + multi + single + + + + wxNO_RTTI + + + wxNO_EXCEPTIONS + + + wxNO_THREADS + __WXDEBUG__ @@ -243,26 +267,56 @@ _UNICODE + wxUSE_UNICODE=0 - + + wxUSE_UNICODE_MSLU=1 + + + + + _WIN32_WINNT=0x0400 + + unicows + + + gdiplus + + + wxUSE_GRAPHICS_CONTEXT=1 + + + + + /MACHINE:AMD64 + /MACHINE:AMD64 + /MACHINE:IA64 + /MACHINE:IA64 + + - +