]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/setup.py
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
wxDFB doesn't require extra configure options anymore
[wxWidgets.git] / wxPython / setup.py
diff --git a/wxPython/setup.py b/wxPython/setup.py
index 51eef48d553b29ea2b94b010ef0cc85ded26f73f..6413627345be67357aa72d377263aec000ee9021 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -189,10 +189,11 @@ wxpExtensions.append(ext)
 # Extension for the GDI module
 swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps +
-                        ['src/__gdi_rename.i',
-                         'src/_bitmap.i',
+                        ['src/_bitmap.i',
                          'src/_colour.i',
                          'src/_dc.i',
+                         'src/_graphics.i',
+                         'src/_overlay.i',
                          'src/_gdiobj.i',
                          'src/_imaglist.i',
                          'src/_region.i',
@@ -207,11 +208,11 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
                          'src/_pen.i',
                          'src/_palette.i',
                          'src/_renderer.i',
-##                         'src/_pseudodc.i',
+                         'src/_pseudodc.i',
                          ],
                         True)
 ext = Extension('_gdi_', ['src/drawlist.cpp',
-##                          'src/pseudodc.cpp'
+                          'src/pseudodc.cpp'
                           ] + swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,
@@ -231,9 +232,7 @@ wxpExtensions.append(ext)
 # Extension for the windows module
 swig_sources = run_swig(['windows.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps +
-                        ['src/__windows_rename.i',
-                         'src/__windows_reverse.txt',
-                         'src/_panel.i',
+                        ['src/_panel.i',
                          'src/_toplvl.i',
                          'src/_statusbar.i',
                          'src/_splitter.i',
@@ -265,9 +264,7 @@ wxpExtensions.append(ext)
 # Extension for the controls module
 swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps +
-                        [ 'src/__controls_rename.i',
-                          'src/__controls_reverse.txt',
-                          'src/_toolbar.i',
+                        [ 'src/_toolbar.i',
                           'src/_button.i',
                           'src/_checkbox.i',
                           'src/_choice.i',
@@ -291,6 +288,8 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
                           'src/_datectrl.i',
                           'src/_hyperlink.i',
                           'src/_picker.i',
+                          'src/_collpane.i',
+                          'src/_srchctrl.i',
                           ],
                         True)
 ext = Extension('_controls_', swig_sources,
@@ -310,9 +309,7 @@ wxpExtensions.append(ext)
 # Extension for the misc module
 swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps +
-                        [ 'src/__misc_rename.i',
-                          'src/__misc_reverse.txt',
-                          'src/_settings.i',
+                        [ 'src/_settings.i',
                           'src/_functions.i',
                           'src/_misc.i',
                           'src/_tipdlg.i',
@@ -331,6 +328,7 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
                           'src/_clipbrd.i',
                           'src/_stdpaths.i',
                           'src/_power.i',
+                          'src/_about.i',
                           ],
                         True)
 ext = Extension('_misc_', swig_sources,
@@ -364,6 +362,20 @@ ext = Extension('_calendar', swig_sources,
 wxpExtensions.append(ext)
 
 
+swig_sources = run_swig(['combo.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force, swig_args, swig_deps)
+ext = Extension('_combo', swig_sources,
+                include_dirs =  includes,
+                define_macros = defines,
+                library_dirs = libdirs,
+                libraries = libs,
+                extra_compile_args = cflags,
+                extra_link_args = lflags,
+                **depends
+                )
+wxpExtensions.append(ext)
+
+
 swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 ext = Extension('_grid', swig_sources,
@@ -394,7 +406,7 @@ wxpExtensions.append(ext)
 
 
 mediaLibs = libs[:]
-if not MONOLITHIC:
+if not MONOLITHIC and findLib('media', libdirs):
     mediaLibs += makeLibName('media')
 swig_sources = run_swig(['media.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
@@ -442,14 +454,14 @@ wxpExtensions.append(ext)
 
 swig_sources = run_swig(['xrc.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps +
-                        [ 'src/_xrc_rename.i',
-                          'src/_xrc_ex.py',
+                        [ 'src/_xrc_ex.py',
                           'src/_xmlres.i',
                           'src/_xmlsub.i',
                           'src/_xml.i',
                           'src/_xmlhandler.i',
                           ])
-if not MONOLITHIC:
+
+if not MONOLITHIC and findLib('xrc', libdirs):
     xrcLib = makeLibName('xrc')
 else:
     xrcLib = []
@@ -471,7 +483,7 @@ wxpExtensions.append(ext)
 
 swig_sources = run_swig(['richtext.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
-if not MONOLITHIC:
+if not MONOLITHIC and findLib('richtext', libdirs):
     richLib = makeLibName('richtext')
 else:
     richLib = []
@@ -495,8 +507,10 @@ swig_sources = run_swig(['aui.i'], 'src', GENDIR, PKGDIR,
                                      opj(WXDIR, 'include/wx/aui/framemanager.h'),
                                      opj(WXDIR, 'include/wx/aui/floatpane.h'),
                                      opj(WXDIR, 'include/wx/aui/dockart.h'),
+                                     opj(WXDIR, 'include/wx/aui/auibook.h'),
+                                     opj(WXDIR, 'include/wx/aui/tabmdi.h'),
                                      ])
-if not MONOLITHIC:
+if not MONOLITHIC and findLib('aui', libdirs):
     auiLib = makeLibName('aui')
 else:
     auiLib = []
@@ -512,6 +526,23 @@ ext = Extension('_aui', swig_sources,
 wxpExtensions.append(ext)
 
 
+swig_sources = run_swig(['animate.i'], 'src', GENDIR, PKGDIR,
+                            USE_SWIG, swig_force, swig_args, swig_deps)
+ext = Extension('_animate',
+                swig_sources,
+                
+                include_dirs =  includes + CONTRIBS_INC,
+                define_macros = defines,
+                
+                library_dirs = libdirs,
+                libraries = libs,
+
+                extra_compile_args = cflags,
+                extra_link_args = lflags,
+                )
+
+wxpExtensions.append(ext)
+
 
 
 
@@ -683,7 +714,8 @@ if BUILD_GIZMOS:
     location = 'contrib/gizmos'
 
     swig_sources = run_swig(['gizmos.i'], location, GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
+                            USE_SWIG, swig_force, swig_args, swig_deps +
+                            [ '%s/_treelist.i' % location])
 
     ext = Extension('_gizmos',
                     [ '%s/treelistctrl.cpp' % opj(location, 'wxCode/src') ] + swig_sources,
@@ -701,34 +733,6 @@ if BUILD_GIZMOS:
     wxpExtensions.append(ext)
 
 
-#----------------------------------------------------------------------
-# Define the ANIMATE  extension module
-#----------------------------------------------------------------------
-
-if BUILD_ANIMATE:
-    msg('Preparing ANIMATE...')
-    location = 'contrib/animate'
-
-    swig_sources = run_swig(['animate.i'], location, GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
-
-    ext = Extension('_animate',
-                    swig_sources,
-
-                    include_dirs =  includes + CONTRIBS_INC,
-                    define_macros = defines,
-
-                    library_dirs = libdirs,
-                    libraries = libs + makeLibName('animate'),
-
-                    extra_compile_args = cflags,
-                    extra_link_args = lflags,
-                    )
-
-    wxpExtensions.append(ext)
-
-
-
 #----------------------------------------------------------------------
 # Define the DLLWIDGET  extension module
 #----------------------------------------------------------------------
@@ -799,6 +803,8 @@ else:
     i_files = glob.glob(opj("src/*.i"))   + \
               glob.glob(opj("src/_*.py")) + \
               glob.glob(opj("src/*.swg"))
+    if BUILD_GLCANVAS:
+        i_files += glob.glob(opj("contrib/glcanvas/*.i"))
 
     HEADERS = zip(h_files, ["/wxPython"]*len(h_files)) + \
               zip(i_files, ["/wxPython/i_files"]*len(i_files))
@@ -846,6 +852,7 @@ if __name__ == "__main__":
                           'wx.lib',
                           'wx.lib.analogclock',
                           'wx.lib.analogclock.lib_setup',
+                          'wx.lib.art',
                           'wx.lib.colourchooser',
                           'wx.lib.editor',
                           'wx.lib.floatcanvas',
wxWidgets (Impactor)