Merge pull request #1026 from RobinD42/sip-4.19.13

Switch to SIP 4.19.13

(cherry picked from commit a268da9b84)
This commit is contained in:
Robin Dunn
2018-10-04 10:22:30 +08:00
parent 41be300c46
commit ac1a323144
11 changed files with 363 additions and 118 deletions

View File

@@ -1,4 +1,5 @@
#----------------------------------------------------------------------
#----------------------------------------------------------------------
# Name: buildtools.config
# Purpose: Code to set and validate platform options and etc. for
# the wxPython build. Moved to their own module and
@@ -119,8 +120,9 @@ class Configuration(object):
'-w', # enable warnings
'-o', # turn on auto-docstrings
'-g', # turn on acquire/release of GIL for everything
'-n', 'wx.siplib', # name of the module containing the siplib
#'-e', # turn on exceptions support
#'-T', # turn off writing the timestamp to the generated files '-g', # always release and reaquire the GIL
#'-T', # turn off writing the timestamp to the generated files
#'-r', # turn on function call tracing
'-I', os.path.join(phoenixDir(), 'src'),
'-I', os.path.join(phoenixDir(), 'sip', 'gen'),
@@ -166,6 +168,8 @@ class Configuration(object):
('WXUSINGDLL', '1'),
('ISOLATION_AWARE_ENABLED', None),
#('NDEBUG',), # using a 1-tuple makes it do an undef
('SIP_MODULE_NAME', 'wx.siplib'),
('SIP_MODULE_BASENAME', 'siplib'),
]
self.libs = []