return '$(%s)' % name
utils.addSubstituteCallback('CFG', __noopSubst)
utils.addSubstituteCallback('LIBDIRNAME', __noopSubst)
+utils.addSubstituteCallback('SETUPHDIR', __noopSubst)
+utils.addSubstituteCallback('OBJS', __noopSubst)
def mk_wxid(id):
# All libs that are part of the main library (i.e. non-contrib):
-MAIN_LIBS = ['mono', 'base', 'core', 'html', 'xml', 'net']
+MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
+ 'odbc', 'dbgrid']
# List of library names/ids for categories with different names:
-LIBS_NOGUI = ['xml', 'net']
-LIBS_GUI = ['core', 'html', 'gl']
+LIBS_NOGUI = ['xml', 'net', 'odbc']
+LIBS_GUI = ['core', 'adv', 'html', 'gl', 'dbgrid']
+# 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):
"""Returns string that can be used as library name, including name
else:
return mkLibName(wxlibname)
+def extraLdflags(wxlibname):
+ if wxlibname in EXTRALIBS:
+ return EXTRALIBS[wxlibname]
+ else:
+ return ''
wxVersion = None
VERSION_FILE = '../../include/wx/version.h'
def callback(cond, sources):
prf = suf = ''
- if sources[0].isspace(): prefix=' '
- if sources[-1].isspace(): suffix=' '
+ if sources[0].isspace(): prf=' '
+ if sources[-1].isspace(): suf=' '
retval = []
for s in sources.split():
if s.endswith('.h'):
retval.append(s)
return '%s%s%s' % (prf, ' '.join(retval), suf)
return utils.substitute2(files, callback)
+
+
+def makeDspDependency(lib):
+ """Returns suitable entry for <depends-on-dsp> for main libs."""
+ return '%s:$(nativePaths(WXTOPDIR))build\\msw\\wx_%s.dsp' % (lib,lib)