X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bae0a94647df0170a7738264c3f64342a27d936..daebb44c74bdbdc8ce43bd4aa471774d92f35f02:/build/bakefiles/common.bkl?ds=inline diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 4315de2ceb..6efad50fb0 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -2,40 +2,38 @@ - + + + + + + + + + 0 + + + + 0 + - - - - - - $(wxwin.getVersionMajor()) - $(wxwin.getVersionMinor()) - $(wxwin.getVersionRelease()) - - $(WXVER_MAJOR).$(WXVER_MINOR).$(WXVER_RELEASE) - + + + + + - $(int(int(WXVER_MINOR) % 2 == 0)) - - 0.0.0 - $(WXVER_RELEASE).0.0 - - $(WX_VERSION) - - $(WXVER_MAJOR)$(WXVER_MINOR) - $(WXVER_MAJOR)$(WXVER_MINOR)$(WXVER_RELEASE) - - - @@ -44,7 +42,7 @@ base $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) - + _carbon @@ -67,12 +65,13 @@ d - u + + u - $(WXUNICODEFLAG)$(WXDEBUGFLAG) + $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) - + univ @@ -83,14 +82,14 @@ wx_base$(WXBASEPORT) wx_$(PORTNAME)$(WXUNIVNAME) - -$(WXVER_MAJOR).$(WXVER_MINOR) + -$(WX_RELEASE) - wxbase$(WXBASEPORT)$(WXVER_MAJOR)$(WXVER_MINOR) + wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT) - wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR) + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT) @@ -110,7 +109,7 @@ $(WXVERSIONTAG) - + @@ -121,20 +120,31 @@ $(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('odbc'))) + $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) @@ -143,12 +153,19 @@ $(mk.evalExpr(wxwin.mkLibName('mono'))) - - + + - + + + _$(CPU) + _amd64 + _amd64 + _ia64 + _ia64 + @@ -158,7 +175,9 @@ $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) - $(COMPILER)_$(CFG_NAME_PART) + + $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU) + build_cbx_$(CFG_NAME_PART) @@ -166,25 +185,29 @@ $(OBJS) - + + + lib + dll + $(TOOLKIT_LOWERCASE)_lib + $(TOOLKIT_LOWERCASE)_dll + + $(top_builddir)lib - - $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_lib$(CFG) - - - $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)_dll$(CFG) + + $(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) - + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) - - + + @@ -196,7 +219,8 @@ off - $(DEBUGINFO) + on + off off on @@ -208,6 +232,24 @@ on off + + on + off + + + multi + single + + + + wxNO_RTTI + + + wxNO_EXCEPTIONS + + + wxNO_THREADS + __WXDEBUG__ @@ -221,44 +263,170 @@ _UNICODE - + + wxUSE_UNICODE_MSLU=1 + + + + + _WIN32_WINNT=0x0400 + + unicows + + /MACHINE:AMD64 + /MACHINE:AMD64 + /MACHINE:IA64 + /MACHINE:IA64 + + - + + + + $(FORMAT in ['msvc6prj','msevc4prj']) + + + + + + + $(addPrefixToList('include\', wxwin.headersOnly(value))) + + + + + $(addPrefixToList('include\\', wxwin.headersOnly(value))) + + + + + + + +Creating $(SETUPHDIR)\wx\setup.h +InputPath=..\include\wx\%s + +"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" +$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h + + + + + + + $(addPrefixToList('wx/', value)) + + + $(nativePaths(addPrefixToList('include/wx/', value))) + + + + + + + + + msw/wince/setup.h + + + $(msvc_copy_setup_h_script % 'msw\wince\setup.h') + + + + + msw/setup.h + univ/setup.h + + + + $(msvc_copy_setup_h_script % 'msw\setup.h') + + + + + $(msvc_copy_setup_h_script % 'univ\setup.h') + + + + + + + + + + msw/genrcdefs.h + + + + $(_COMPILER) + cl + + +Creating $(SETUPHDIR)\wx\msw\rcdefs.h + +"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(DOLLAR)(SETUPHDIR)\wx\msw" +$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h" + + + + + + - + @@ -268,45 +436,99 @@ - + - + + + + $(EXTRALIBS) $(EXTRALIBS_GUI) + $(EXTRALIBS) + + + + $(EXTRALIBS_GUI) + + + + $(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10 + + dos4gw + + + - - - - $(addPrefixToList('include\', wxwin.headersOnly(value))) - - - - - - - wx/msw/setup.h - - include\wx\msw\setup.h - - -Creating $(SETUPHDIR)\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" -$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h - - - - - - + 0 - + + + + + $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) + + + + -