Updated to SWIG 1.3.24 (plus a patch that corrects a bug and adds back
some things that were changed/removed from my patch I submitted to them.) Since it is now possible easily and simply share the SWIG type tables across modules I reverted to always using the stock SWIG runtime instead of my slightly hacked up version of it exported via the wxPython C API. The %name directive is now deprecated so replaced most uses of it with a custom %Rename macro that uses %rename internally. These will evetually need to be replaced with a DocDecl macro when docstrings are added. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -644,7 +644,7 @@ if os.name == 'nt':
|
||||
(WXPLAT, None),
|
||||
('WXUSINGDLL', '1'),
|
||||
|
||||
('SWIG_GLOBAL', None),
|
||||
('SWIG_TYPE_TABLE', 'wxPython_type_table'),
|
||||
('WXP_USE_THREAD', '1'),
|
||||
]
|
||||
|
||||
@@ -698,7 +698,7 @@ if os.name == 'nt':
|
||||
elif os.name == 'posix':
|
||||
WXDIR = '..'
|
||||
includes = ['include', 'src']
|
||||
defines = [('SWIG_GLOBAL', None),
|
||||
defines = [('SWIG_TYPE_TABLE', 'wxPython_type_table'),
|
||||
('HAVE_CONFIG_H', None),
|
||||
('WXP_USE_THREAD', '1'),
|
||||
]
|
||||
@@ -813,7 +813,6 @@ swig_args = ['-c++',
|
||||
|
||||
'-I' + opj(WXPY_SRC, 'src'),
|
||||
'-D'+WXPLAT,
|
||||
'-noruntime'
|
||||
]
|
||||
if UNICODE:
|
||||
swig_args.append('-DwxUSE_UNICODE')
|
||||
@@ -823,10 +822,7 @@ if FULL_DOCS:
|
||||
|
||||
|
||||
swig_deps = [ opj(WXPY_SRC, 'src/my_typemaps.i'),
|
||||
opj(WXPY_SRC, 'src/my_fragments.i'),
|
||||
opj(WXPY_SRC, 'src/common.swg'),
|
||||
opj(WXPY_SRC, 'src/pyrun.swg'),
|
||||
opj(WXPY_SRC, 'src/python.swg'),
|
||||
opj(WXPY_SRC, 'src/pyfragments.swg'),
|
||||
]
|
||||
|
||||
depends = [ #'include/wx/wxPython/wxPython.h',
|
||||
|
Reference in New Issue
Block a user