X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7e4c6681deffc5bee96110debeeeb204d50b358..0428ac8c47bc42aef38f2b4a01ea3e7ded41bf0f:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 9075a884d5..52dae40a13 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -29,37 +29,9 @@ - - - - - $(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) - + + @@ -148,6 +120,9 @@ $(mk.evalExpr(wxwin.mkLibName('net'))) + + $(mk.evalExpr(wxwin.mkLibName('qa'))) + $(mk.evalExpr(wxwin.mkLibName('core'))) @@ -155,7 +130,7 @@ $(mk.evalExpr(wxwin.mkLibName('adv'))) - $(mk.evalExpr(wxwin.mkLibName('media'))) + $(mk.evalExpr(wxwin.mkLibName('media'))) $(mk.evalExpr(wxwin.mkLibName('html'))) @@ -174,6 +149,12 @@ $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) + + $(mk.evalExpr(wxwin.mkLibName('aui'))) + + + $(mk.evalExpr(wxwin.mkLibName('richtext'))) + $(mk.evalExpr(wxwin.mkLibName('mono'))) @@ -186,6 +167,10 @@ _$(CPU) + _amd64 + _amd64 + _ia64 + _ia64 @@ -208,8 +193,10 @@ - lib - dll + lib + dll + $(TOOLKIT_LOWERCASE)_lib + $(TOOLKIT_LOWERCASE)_dll @@ -238,7 +225,8 @@ off - $(DEBUGINFO) + on + off off on @@ -260,13 +248,13 @@ - wxNO_RTTI + wxNO_RTTI - wxNO_EXCEPTIONS + wxNO_EXCEPTIONS - wxNO_THREADS + wxNO_THREADS @@ -281,6 +269,9 @@ _UNICODE + + wxUSE_UNICODE_MSLU=1 + @@ -291,6 +282,13 @@ unicows + + /MACHINE:AMD64 + /MACHINE:AMD64 + /MACHINE:IA64 + /MACHINE:IA64 + +