X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ea8df6e6b7818ffd9f12d2b126f1da7c453443c..2dfa1180b02ff64115f9ad96e270edea64027a3b:/wxPython/setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index d672a44196..42d59936a9 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -82,24 +82,16 @@ CLEANUP.append('wx/__version__.py')
 
 if USE_SWIG:
     try:
-        # It may come on either stdout or stderr, depending on the
-        # version, so read both.
-        i, o, e = os.popen3(SWIG + ' -version', 't')
-        stext = o.read() + e.read()
-        import re
-        match = re.search(r'[0-9]+\.[0-9]+\.[0-9]+$', stext, re.MULTILINE)
-        if not match:
-            raise 'NotFound'
-        SVER = match.group(0)
+        SVER = swig_version()
         open('include/wx/wxPython/swigver.h', 'w').write('''\
 // This file was generated by setup.py
 
 #define wxPy_SWIG_VERSION "SWIG-%s"
 ''' % SVER)
         msg('Using SWIG-' + SVER)
-
     except:
         msg('\nUnable to get SWIG version number\n')
+        
 
 
 #----------------------------------------------------------------------
@@ -294,6 +286,8 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
                           'src/_cshelp.i',
                           'src/_dragimg.i',
                           'src/_datectrl.i',
+                          'src/_hyperlink.i',
+                          'src/_picker.i',
                           ],
                         True)
 ext = Extension('_controls_', swig_sources,
@@ -333,6 +327,7 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
                           'src/_display.i',
                           'src/_clipbrd.i',
                           'src/_stdpaths.i',
+                          'src/_power.i',
                           ],
                         True)
 ext = Extension('_misc_', swig_sources,
@@ -396,8 +391,8 @@ wxpExtensions.append(ext)
 
 
 mediaLibs = libs[:]
-if not MONOLITHIC and os.name == 'nt':
-    mediaLibs.append(makeLibName('media')[0])
+if not MONOLITHIC:
+    mediaLibs += makeLibName('media')
 swig_sources = run_swig(['media.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 ext = Extension('_media', swig_sources,
@@ -458,7 +453,7 @@ ext = Extension('_xrc',
                 define_macros = defines,
 
                 library_dirs = libdirs,
-                libraries = libs,
+                libraries = libs + makeLibName('xrc'),
 
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
@@ -466,6 +461,24 @@ ext = Extension('_xrc',
 wxpExtensions.append(ext)
 
 
+
+swig_sources = run_swig(['richtext.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force, swig_args, swig_deps)
+ext = Extension('_richtext', swig_sources,
+                include_dirs =  includes,
+                define_macros = defines,
+                library_dirs = libdirs,
+                libraries = libs + makeLibName('richtext'),
+                extra_compile_args = cflags,
+                extra_link_args = lflags,
+                **depends
+                )
+wxpExtensions.append(ext)
+
+
+
+
+
 #----------------------------------------------------------------------
 # Define the GLCanvas extension module
 #----------------------------------------------------------------------
@@ -480,8 +493,9 @@ if BUILD_GLCANVAS:
     gl_libs = []
     if os.name == 'posix':
         gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]
-        gl_lflags = gl_config.split() + lflags
+        gl_lflags = gl_config.split()
         gl_libs = libs
+        
     else:
         gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
         gl_lflags = lflags
@@ -792,6 +806,8 @@ if __name__ == "__main__":
                           'wx',
                           'wx.build',
                           'wx.lib',
+                          'wx.lib.analogclock',
+                          'wx.lib.analogclock.lib_setup',
                           'wx.lib.colourchooser',
                           'wx.lib.editor',
                           'wx.lib.floatcanvas',