Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge recent wxPython changes from 2.8 branch to HEAD

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-06-23 20:50:39 +00:00
parent e31f4da5f0
commit fe45b493dc
50 changed files with 7989 additions and 2997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wxPython/setup.py
View File

@@ -482,7 +482,12 @@ wxpExtensions.append(ext)
swig_sources = run_swig(['richtext.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
USE_SWIG, swig_force, swig_args,
swig_deps + [ 'src/_richtextbuffer.i',
'src/_richtextctrl.i',
'src/_richtexthtml.i',
'src/_richtextxml.i',
])
if not MONOLITHIC and findLib('richtext', libdirs):
richLib = makeLibName('richtext')
else:
@@ -569,6 +574,11 @@ if BUILD_GLCANVAS:
gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
gl_lflags = lflags
if sys.platform[:6] == "darwin" and WXPORT == 'mac':
if not ARCH == "":
gl_lflags.append("-arch")
gl_lflags.append(ARCH)
ext = Extension('_glcanvas',
swig_sources,