projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reuse wxObjectRefData for various ref-counted classes (closes #10886)
[wxWidgets.git]
/
build
/
bakefiles
/
wxwin.py
diff --git
a/build/bakefiles/wxwin.py
b/build/bakefiles/wxwin.py
index 25858eb20a5073849b86c2426529159bc840cd3b..bad7270fa049ff3958717c7adc88d1bdc65d7e50 100644
(file)
--- a/
build/bakefiles/wxwin.py
+++ b/
build/bakefiles/wxwin.py
@@
-38,19
+38,20
@@
def mk_wxid(id):
return wxid
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',
MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
- 'media', '
odbc', 'qa', 'dbgrid', 'xr
c']
+ 'media', '
qa', 'xrc', 'aui', 'propgrid', 'richtext', 'st
c']
# List of library names/ids for categories with different names:
# 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)',
# Additional libraries that must be linked in:
EXTRALIBS = {
'gl' : '$(EXTRALIBS_OPENGL)',
'xml' : '$(EXTRALIBS_XML)',
'html' : '$(EXTRALIBS_HTML)',
- 'odbc' : '$(EXTRALIBS_ODBC)',
'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
+ 'media' : '$(EXTRALIBS_MEDIA)',
}
def mkLibName(wxid):
}
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 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)
"""
if wxlibname in MAIN_LIBS:
return '$(WXLIB_%s)' % wxlibname.upper()
else:
return mkLibName(wxlibname)
+
def extraLdflags(wxlibname):
if wxlibname in EXTRALIBS:
return EXTRALIBS[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
major = minor = release = None
for l in lines:
if not l.startswith('#define'): continue
- split
ted
= l.strip().split()
- if split
ted
[0] != '#define': continue
- if len(split
ted
) < 3: continue
- name = split
ted
[1]
- value = split
ted
[2]
+ split
line
= l.strip().split()
+ if split
line
[0] != '#define': continue
+ if len(split
line
) < 3: continue
+ name = split
line
[1]
+ value = split
line
[2]
if value == None: continue
if name == 'wxMAJOR_VERSION': major = int(value)
if name == 'wxMINOR_VERSION': minor = int(value)
if value == None: continue
if name == 'wxMAJOR_VERSION': major = int(value)
if name == 'wxMINOR_VERSION': minor = int(value)