#
-# Helper functions for wxWindows bakefiles
+# Helper functions for wxWidgets bakefiles
#
# $Id$
#
# 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)
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."""
# 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']
# 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']
# 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):
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')
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)
def makeDspDependency(lib):
"""Returns suitable entry for <depends-on-dsp> for main libs."""
- return '%s:$(nativePaths(WXTOPDIR))build\msw\wx_%s.dsp' % (lib,lib)
+ return '%s:$(nativePaths(WXTOPDIR))build\\msw\\wx_%s.dsp' % (lib,lib)