Set stc and xrc to use GENDIR again as SWIG on Mac is still generating
slightly different code than the other platforms for some reason git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -446,7 +446,7 @@ if BUILD_STC:
|
|||||||
## os.chdir(cwd)
|
## os.chdir(cwd)
|
||||||
|
|
||||||
|
|
||||||
swig_sources = run_swig(['stc.i'], location, '', PKGDIR,
|
swig_sources = run_swig(['stc.i'], location, GENDIR, PKGDIR,
|
||||||
USE_SWIG, swig_force,
|
USE_SWIG, swig_force,
|
||||||
swig_args + ['-I'+STC_H, '-I'+location],
|
swig_args + ['-I'+STC_H, '-I'+location],
|
||||||
[opj(STC_H, 'stc.h')] + swig_deps)
|
[opj(STC_H, 'stc.h')] + swig_deps)
|
||||||
@@ -540,7 +540,7 @@ if BUILD_XRC:
|
|||||||
msg('Preparing XRC...')
|
msg('Preparing XRC...')
|
||||||
location = 'contrib/xrc'
|
location = 'contrib/xrc'
|
||||||
|
|
||||||
swig_sources = run_swig(['xrc.i'], location, '', PKGDIR,
|
swig_sources = run_swig(['xrc.i'], location, GENDIR, PKGDIR,
|
||||||
USE_SWIG, swig_force, swig_args, swig_deps +
|
USE_SWIG, swig_force, swig_args, swig_deps +
|
||||||
[ '%s/_xrc_rename.i' % location,
|
[ '%s/_xrc_rename.i' % location,
|
||||||
'%s/_xrc_ex.py' % location,
|
'%s/_xrc_ex.py' % location,
|
||||||
|
Reference in New Issue
Block a user