Merge recent wxPython changes from 2.8 branch to HEAD

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index b8a1f05f4f2888ffbdcc4dbeb0aba590c71e6afd..d7c8adb430b3abf66827d5f628993a4f8af22b81 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -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,