X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d181c36eb6366cb7da719c95eef50b281cedbbdc..75cb911c7c8a475269901bf5f0c69c583d79e498:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 2ac0c1a132..0ab45bc3a4 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -3,7 +3,7 @@ - + @@ -22,41 +22,17 @@ 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) - + + @@ -85,16 +61,20 @@ _$(VENDOR) + - d - d + d + d u + + $(WXUNICODEFLAG)$(WXDEBUGFLAG) + - $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) + $(WX_U_D_SUFFIX)$(WX_LIB_FLAVOUR) @@ -145,6 +125,9 @@ $(mk.evalExpr(wxwin.mkLibName('net'))) + + $(mk.evalExpr(wxwin.mkLibName('qa'))) + $(mk.evalExpr(wxwin.mkLibName('core'))) @@ -152,7 +135,7 @@ $(mk.evalExpr(wxwin.mkLibName('adv'))) - $(mk.evalExpr(wxwin.mkLibName('media'))) + $(mk.evalExpr(wxwin.mkLibName('media'))) $(mk.evalExpr(wxwin.mkLibName('html'))) @@ -163,15 +146,24 @@ $(mk.evalExpr(wxwin.mkLibName('xrc'))) - - - $(mk.evalExpr(wxwin.mkLibName('odbc'))) - + + $(mk.evalExpr(wxwin.mkLibName('aui'))) - - $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) + + $(mk.evalExpr(wxwin.mkLibName('ribbon'))) + + + $(mk.evalExpr(wxwin.mkLibName('propgrid'))) + + + $(mk.evalExpr(wxwin.mkLibName('richtext'))) + + + $(mk.evalExpr(wxwin.mkLibName('stc'))) + + + $(mk.evalExpr(wxwin.mkLibName('webview'))) - $(mk.evalExpr(wxwin.mkLibName('mono'))) @@ -183,6 +175,10 @@ _$(CPU) + _amd64 + _amd64 + _ia64 + _ia64 @@ -190,35 +186,37 @@ dll - $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) + $(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX)$(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 + lib + dll + $(TOOLKIT_LOWERCASE)_lib + $(TOOLKIT_LOWERCASE)_dll - $(top_builddir)lib + $(wx_top_builddir)/lib - $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WX_U_D_SUFFIX) @@ -235,7 +233,8 @@ off - $(DEBUGINFO) + on + off off on @@ -256,10 +255,24 @@ single + + wxNO_RTTI + + + wxNO_EXCEPTIONS + + + wxNO_THREADS + + - __WXDEBUG__ - __WXDEBUG__ + wxDEBUG_LEVEL=0 + + + NDEBUG + NDEBUG + __NO_VC_CRTDBG__ @@ -267,6 +280,10 @@ _UNICODE + wxUSE_UNICODE=0 + + + wxUSE_UNICODE_MSLU=1 @@ -277,6 +294,22 @@ unicows + + cairo + + + $(DOLLAR)(CAIRO_ROOT)/lib + + + $(DOLLAR)(CAIRO_ROOT)/include/cairo + + + + /MACHINE:X64 + /MACHINE:X64 + /MACHINE:IA64 + /MACHINE:IA64 +