X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61639efb6658a7a02dd8b0072c6e0bb4826ef654..1a2df6a75b3d96b35e29b1cf392758cbeeef93e0:/build/bakefiles/wxwin.py?ds=inline diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py index 25858eb20a..bad7270fa0 100644 --- a/build/bakefiles/wxwin.py +++ b/build/bakefiles/wxwin.py @@ -38,19 +38,20 @@ def mk_wxid(id): return wxid -# All libs that are part of the main library (i.e. non-contrib): +# All libs that are part of the main library: MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net', - 'media', 'odbc', 'qa', 'dbgrid', 'xrc'] + 'media', 'qa', 'xrc', 'aui', 'propgrid', 'richtext', 'stc'] # List of library names/ids for categories with different names: -LIBS_NOGUI = ['xml', 'net', 'odbc'] -LIBS_GUI = ['core', 'adv', 'html', 'gl', 'qa', 'dbgrid', 'xrc', 'media'] +LIBS_NOGUI = ['xml', 'net'] +LIBS_GUI = ['core', 'adv', 'html', 'gl', 'qa', 'xrc', 'media', + 'aui', 'propgrid', '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)', + 'media' : '$(EXTRALIBS_MEDIA)', } def mkLibName(wxid): @@ -83,13 +84,13 @@ def libToLink(wxlibname): For one of main libraries, libToLink('foo') returns '$(WXLIB_FOO)' which must be defined in common.bkl as either nothing (in monolithic build) or mkLibName('foo') (otherwise). - For contrib libraries, it returns mkDllName(wxlibname). """ if wxlibname in MAIN_LIBS: return '$(WXLIB_%s)' % wxlibname.upper() else: return mkLibName(wxlibname) + def extraLdflags(wxlibname): if wxlibname in EXTRALIBS: return EXTRALIBS[wxlibname] @@ -109,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)