Now we can build all tarballs on one (Unix shell) box using pre-flight.sh.

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 69ccf7dc00b4758ab988ab01f7696eab76d6900b..42d59936a9366b327dfdc36afd5ce290f4c9fe7d 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -286,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,
@@ -325,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,
@@ -388,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,
@@ -450,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,
@@ -465,7 +468,7 @@ ext = Extension('_richtext', swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
-                libraries = libs,
+                libraries = libs + makeLibName('richtext'),
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 **depends