X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d38306bc2d2c8329cc3408e227cf3c01feaac42..7f733b2674698b95755def1ad46651dc2a1eb4c2:/build/bakefiles/wxwin.py?ds=inline diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py index bb985a1a39..d498c597fb 100644 --- a/build/bakefiles/wxwin.py +++ b/build/bakefiles/wxwin.py @@ -1,5 +1,5 @@ # -# Helper functions for wxWindows bakefiles +# Helper functions for wxWidgets bakefiles # # $Id$ # @@ -11,8 +11,15 @@ import utils # register a substitution function for it that provides additional knowledge # about the option (in this case that it does not contain dir separators and # so utils.nativePaths() doesn't have to do anything with it): -def __noopSubst(func, name): - return '$(%s)' % name + +try: + # this fails in 0.1.4 and 0.1.5 has different subst.callbacks signature: + utils.checkBakefileVersion('0.1.5') + def __noopSubst(name, func, caller): + return '$(%s)' % name +except AttributeError: + def __noopSubst(func, name): + return '$(%s)' % name utils.addSubstituteCallback('CFG', __noopSubst) utils.addSubstituteCallback('LIBDIRNAME', __noopSubst) utils.addSubstituteCallback('SETUPHDIR', __noopSubst) @@ -20,7 +27,7 @@ utils.addSubstituteCallback('OBJS', __noopSubst) def mk_wxid(id): - """Creates wxWindows library identifier from bakefile target ID that + """Creates wxWidgets library identifier from bakefile target ID that follows this convention: DLLs end with 'dll', static libraries end with 'lib'. If withPrefix=1, then _wxid is returned instead of wxid.""" @@ -33,15 +40,18 @@ def mk_wxid(id): # All libs that are part of the main library (i.e. non-contrib): MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net', - 'odbc', 'dbgrid'] + 'media', 'odbc', 'qa', 'dbgrid', 'xrc', 'aui', 'richtext', 'stc'] # List of library names/ids for categories with different names: LIBS_NOGUI = ['xml', 'net', 'odbc'] -LIBS_GUI = ['core', 'adv', 'html', 'gl', 'dbgrid'] +LIBS_GUI = ['core', 'adv', 'html', 'gl', 'qa', 'dbgrid', 'xrc', 'media', + 'aui', 'richtext', 'stc'] # Additional libraries that must be linked in: EXTRALIBS = { 'gl' : '$(EXTRALIBS_OPENGL)', 'xml' : '$(EXTRALIBS_XML)', + 'html' : '$(EXTRALIBS_HTML)', 'odbc' : '$(EXTRALIBS_ODBC)', + 'adv' : '$(PLUGIN_ADV_EXTRALIBS)', } def mkLibName(wxid): @@ -91,7 +101,7 @@ wxVersion = None VERSION_FILE = '../../include/wx/version.h' def getVersion(): - """Returns wxWindows version as a tuple: (major,minor,release).""" + """Returns wxWidgets version as a tuple: (major,minor,release).""" global wxVersion if wxVersion == None: f = open(VERSION_FILE, 'rt') @@ -100,11 +110,11 @@ def getVersion(): major = minor = release = None for l in lines: if not l.startswith('#define'): continue - splitted = l.strip().split() - if splitted[0] != '#define': continue - if len(splitted) < 3: continue - name = splitted[1] - value = splitted[2] + splitline = l.strip().split() + if splitline[0] != '#define': continue + if len(splitline) < 3: continue + name = splitline[1] + value = splitline[2] if value == None: continue if name == 'wxMAJOR_VERSION': major = int(value) if name == 'wxMINOR_VERSION': minor = int(value) @@ -141,18 +151,8 @@ def headersOnly(files): def makeDspDependency(lib): """Returns suitable entry for for main libs.""" + return '%s:$(nativePaths(WXTOPDIR))build\\msw\\wx_%s.dsp' % (lib,lib) - DEPS_TABLE = { - 'core':'base', - 'adv':'core', - 'html':'core', - 'xml':'base', - 'net':'base', - 'odbc':'base', - 'dbgrid':'adv,odbc', - } - if lib in DEPS_TABLE: - deps = ':%s' % DEPS_TABLE[lib] - else: - deps = '' - return '%s:$(nativePaths(WXTOPDIR))build\msw\wx_%s.dsp%s' % (lib,lib,deps) +def makeContribDspDependency(lib): + """Returns suitable entry for for contrib libs.""" + return '%s:$(nativePaths(WXTOPDIR))contrib\\build\\%s\\%s.dsp' % (lib,lib,lib)