non-PCH build fix (according to Tinderbox).

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 6e605c5e167a1493a9149b4e1b44416f2459e45a..0960cd84878d4f3b2656c01d4e41cf38f83287a5 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -193,6 +193,8 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
                          'src/_bitmap.i',
                          'src/_colour.i',
                          'src/_dc.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',
                          'src/_gdiobj.i',
                          'src/_imaglist.i',
                          'src/_region.i',


@@ -207,9 +209,12 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
                          'src/_pen.i',
                          'src/_palette.i',
                          'src/_renderer.i',
                          'src/_pen.i',
                          'src/_palette.i',
                          'src/_renderer.i',

+                         'src/_pseudodc.i',

                          ],
                         True)
                          ],
                         True)

-ext = Extension('_gdi_', ['src/drawlist.cpp'] + swig_sources,
+ext = Extension('_gdi_', ['src/drawlist.cpp',
+                          'src/pseudodc.cpp'
+                          ] + swig_sources,

                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,


@@ -287,6 +292,7 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
                           'src/_dragimg.i',
                           'src/_datectrl.i',
                           'src/_hyperlink.i',
                           'src/_dragimg.i',
                           'src/_datectrl.i',
                           'src/_hyperlink.i',

+                          'src/_picker.i',

                           ],
                         True)
 ext = Extension('_controls_', swig_sources,
                           ],
                         True)
 ext = Extension('_controls_', swig_sources,


@@ -327,6 +333,7 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
                           'src/_clipbrd.i',
                           'src/_stdpaths.i',
                           'src/_power.i',
                           'src/_clipbrd.i',
                           'src/_stdpaths.i',
                           'src/_power.i',

+                          'src/_about.i',

                           ],
                         True)
 ext = Extension('_misc_', swig_sources,
                           ],
                         True)
 ext = Extension('_misc_', swig_sources,


@@ -445,6 +452,10 @@ swig_sources = run_swig(['xrc.i'], 'src', GENDIR, PKGDIR,
                           'src/_xml.i',
                           'src/_xmlhandler.i',
                           ])
                           'src/_xml.i',
                           'src/_xmlhandler.i',
                           ])

+if not MONOLITHIC:
+    xrcLib = makeLibName('xrc')
+else:
+    xrcLib = []

 ext = Extension('_xrc',
                 swig_sources,
 
 ext = Extension('_xrc',
                 swig_sources,
 


@@ -452,7 +463,7 @@ ext = Extension('_xrc',
                 define_macros = defines,
 
                 library_dirs = libdirs,
                 define_macros = defines,
 
                 library_dirs = libdirs,

-                libraries = libs,
+                libraries = libs + xrcLib,

 
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
 
                 extra_compile_args = cflags,
                 extra_link_args = lflags,


@@ -463,11 +474,15 @@ wxpExtensions.append(ext)
 
 swig_sources = run_swig(['richtext.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 
 swig_sources = run_swig(['richtext.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)

+if not MONOLITHIC:
+    richLib = makeLibName('richtext')
+else:
+    richLib = []

 ext = Extension('_richtext', swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
 ext = Extension('_richtext', swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,

-                libraries = libs,
+                libraries = libs + richLib,

                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 **depends
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 **depends


@@ -476,6 +491,49 @@ wxpExtensions.append(ext)
 
 
 
 
 
 

+swig_sources = run_swig(['aui.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force,
+                        swig_args + ['-I'+opj(WXDIR, 'include/wx/aui')],
+                        swig_deps + ['src/_aui_docstrings.i',
+                                     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'),
+                                     ])
+if not MONOLITHIC:
+    auiLib = makeLibName('aui')
+else:
+    auiLib = []
+ext = Extension('_aui', swig_sources,
+                include_dirs =  includes,
+                define_macros = defines,
+                library_dirs = libdirs,
+                libraries = libs + auiLib,
+                extra_compile_args = cflags,
+                extra_link_args = lflags,
+                **depends
+                )
+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)
+
+

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -490,10 +548,12 @@ if BUILD_GLCANVAS:
                             USE_SWIG, swig_force, swig_args, swig_deps)
 
     gl_libs = []
                             USE_SWIG, swig_force, swig_args, swig_deps)
 
     gl_libs = []

+    gl_libdirs = libdirs[:]

     if os.name == 'posix':
         gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]
         gl_lflags = gl_config.split()
     if os.name == 'posix':
         gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]
         gl_lflags = gl_config.split()

-        gl_libs = libs
+        gl_lflags = adjustLFLAGS(gl_lflags, gl_libdirs, gl_libs)
+

         
     else:
         gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
         
     else:
         gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')


@@ -505,7 +565,7 @@ if BUILD_GLCANVAS:
                     include_dirs = includes + CONTRIBS_INC,
                     define_macros = defines,
 
                     include_dirs = includes + CONTRIBS_INC,
                     define_macros = defines,
 

-                    library_dirs = libdirs,
+                    library_dirs = gl_libdirs,

                     libraries = gl_libs,
 
                     extra_compile_args = cflags,
                     libraries = gl_libs,
 
                     extra_compile_args = cflags,


@@ -644,7 +704,8 @@ if BUILD_GIZMOS:
     location = 'contrib/gizmos'
 
     swig_sources = run_swig(['gizmos.i'], location, GENDIR, PKGDIR,
     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,
 
     ext = Extension('_gizmos',
                     [ '%s/treelistctrl.cpp' % opj(location, 'wxCode/src') ] + swig_sources,


@@ -662,34 +723,6 @@ if BUILD_GIZMOS:
     wxpExtensions.append(ext)
 
 
     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
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # Define the DLLWIDGET  extension module
 #----------------------------------------------------------------------


@@ -838,6 +871,21 @@ if __name__ == "__main__":
                            },
               )
 
                            },
               )
 

+        setup(name = 'wxaddons', 
+                  version          = VERSION,
+                  description      = DESCRIPTION,
+                  long_description = LONG_DESCRIPTION,
+                  author           = AUTHOR,
+                  author_email     = AUTHOR_EMAIL,
+                  url              = URL,
+                  download_url     = DOWNLOAD_URL,
+                  license          = LICENSE,
+                  platforms        = PLATFORMS,
+                  classifiers      = filter(None, CLASSIFIERS.split("\n")),
+                  keywords         = KEYWORDS,
+                  
+                  packages = ['wxaddons']
+             )

 
         if INSTALL_MULTIVERSION:
             setup(name             = 'wxPython-common',
 
         if INSTALL_MULTIVERSION:
             setup(name             = 'wxPython-common',