call PKG_PROG_PKG_CONFIG before checking for gnomeprintui, gnomevfs and hildon librar...

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 43a2a37691e4275456e4b2715a32948657a7e373..f0068aa9ecdf3d11ef2ad8cfb576f0191a2ef9fe 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -194,6 +194,7 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
                          'src/_colour.i',
                          'src/_dc.i',
                          'src/_graphics.i',
+                         'src/_overlay.i',
                          'src/_gdiobj.i',
                          'src/_imaglist.i',
                          'src/_region.i',
@@ -332,6 +333,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,
@@ -514,6 +516,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)
+
 
 
 
@@ -704,34 +723,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
 #----------------------------------------------------------------------
@@ -802,6 +793,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))