X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a8110962140d874ea1ff2a4010276b17837d763..6a603a10e77f719458939d117e46f7d8ed0b372b:/build/bakefiles/common.bkl diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index 77f2e66b5e..89080fa27e 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -3,42 +3,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) - - - @@ -47,7 +43,7 @@ base $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) - + _carbon @@ -74,9 +70,9 @@ u - $(WXUNICODEFLAG)$(WXDEBUGFLAG) + $(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) - + univ @@ -87,14 +83,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) @@ -114,7 +110,7 @@ $(WXVERSIONTAG) - + @@ -125,38 +121,52 @@ $(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('odbc'))) - + + $(mk.evalExpr(wxwin.mkLibName('xrc'))) + + + $(mk.evalExpr(wxwin.mkLibName('aui'))) + + + $(mk.evalExpr(wxwin.mkLibName('richtext'))) - - $(mk.evalExpr(wxwin.mkLibName('dbgrid'))) + + $(mk.evalExpr(wxwin.mkLibName('stc'))) $(mk.evalExpr(wxwin.mkLibName('mono'))) - - + + - + _$(CPU) + _amd64 + _amd64 + _ia64 + _ia64 @@ -166,36 +176,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) - - + + @@ -207,7 +221,8 @@ off - $(DEBUGINFO) + on + off off on @@ -219,6 +234,24 @@ on off + + on + off + + + multi + single + + + + wxNO_RTTI + + + wxNO_EXCEPTIONS + + + wxNO_THREADS + __WXDEBUG__ @@ -231,131 +264,286 @@ _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 + + - + - - - - $(FORMAT in ['msvc6prj','msevc4prj']) + + - $(addPrefixToList('include\', wxwin.headersOnly(value))) + $(addPrefixToList('include\\', wxwin.headersOnly(value))) - - - wx/msw/wince/setup.h - wince\setup.h - wince_setup_h + + +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 - - wx/msw/setup.h - setup.h - setup_h + + + + + FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE + +Creating $(SETUPHDIR)\wx\setup.h +InputPath=..\..\include\wx\%s + +"$(SETUPHDIR)\wx\setup.h" : "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" +$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h + + + + + + + $(addPrefixToList('wx/', value)) + - include\wx\msw\$(vc_setup_h) + $(nativePaths(addPrefixToList('include/wx/', value))) - -Creating $(SETUPHDIR)\wx\setup.h -InputPath=..\include\wx\msw\$(vc_setup_h) + + -"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" -$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h + + + + + 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 +InputPath=..\..\include\wx\msw\genrcdefs.h + +"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw" +$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h" + + + + FIXME: THIS OBSOLETE CODE ISN'T NEEDED ANYMORE + + +Creating $(SETUPHDIR)\wx\msw\rcdefs.h +InputPath=..\..\include\wx\msw\genrcdefs.h + +"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(SETUPHDIR)\wx\msw" +$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h" + + - + - + + - - + + + + $(EXTRALIBS) $(EXTRALIBS_GUI) + $(EXTRALIBS) + + + + $(EXTRALIBS_GUI) + + + + $(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10 + + dos4gw + + + - - + 0 - + + + + + $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) + + + + -