X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/102d46f3d675b404bc15d8c540e27f770f800945..467175ab3f2177aa824ceb7b67934fd54ce4e8e0:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 9d1ae8e5d2..3daa897163 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -3,7 +3,7 @@ - + @@ -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) - + + @@ -158,7 +130,7 @@ $(mk.evalExpr(wxwin.mkLibName('adv'))) - $(mk.evalExpr(wxwin.mkLibName('media'))) + $(mk.evalExpr(wxwin.mkLibName('media'))) $(mk.evalExpr(wxwin.mkLibName('html'))) @@ -177,6 +149,15 @@ $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) + + $(mk.evalExpr(wxwin.mkLibName('aui'))) + + + $(mk.evalExpr(wxwin.mkLibName('richtext'))) + + + $(mk.evalExpr(wxwin.mkLibName('stc'))) + $(mk.evalExpr(wxwin.mkLibName('mono'))) @@ -189,6 +170,10 @@ _$(CPU) + _amd64 + _amd64 + _ia64 + _ia64 @@ -199,24 +184,21 @@ $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - - $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) - - - build_cbx_$(CFG_NAME_PART) + $(COMPILER)_$(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) @@ -241,7 +223,8 @@ off - $(DEBUGINFO) + on + off off on @@ -263,13 +246,13 @@ - wxNO_RTTI + wxNO_RTTI - wxNO_EXCEPTIONS + wxNO_EXCEPTIONS - wxNO_THREADS + wxNO_THREADS @@ -284,6 +267,9 @@ _UNICODE + + wxUSE_UNICODE_MSLU=1 + @@ -294,6 +280,22 @@ unicows + + + gdiplus + + + wxUSE_GRAPHICS_CONTEXT=1 + + + + + /MACHINE:AMD64 + /MACHINE:AMD64 + /MACHINE:IA64 + /MACHINE:IA64 + +