added #ifdef __X__ forgotten in last commit

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 1e6cbd820cc80d3a27c83d4785f7bccbd485c67e..0f1b24d2b7c8831b3f7f343240d305e8b4572ec1 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -289,6 +289,7 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
                           'src/_hyperlink.i',
                           'src/_picker.i',
                           'src/_collpane.i',
                           'src/_hyperlink.i',
                           'src/_picker.i',
                           'src/_collpane.i',

+                          'src/_srchctrl.i',

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


@@ -507,6 +508,7 @@ swig_sources = run_swig(['aui.i'], 'src', GENDIR, PKGDIR,
                                      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/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 and findLib('aui', libdirs):
     auiLib = makeLibName('aui')
                                      ])
 if not MONOLITHIC and findLib('aui', libdirs):
     auiLib = makeLibName('aui')


@@ -654,6 +656,10 @@ if BUILD_STC:
                              opj(location, "_stc_gendocs.i"),
                              ] + swig_deps)
 
                              opj(location, "_stc_gendocs.i"),
                              ] + swig_deps)
 

+    stcLibs = libs[:]
+    if not MONOLITHIC and findLib('stc', libdirs):
+        stcLibs += makeLibName('stc')
+

     ext = Extension('_stc',
                     swig_sources,
 
     ext = Extension('_stc',
                     swig_sources,
 


@@ -661,7 +667,7 @@ if BUILD_STC:
                     define_macros = defines,
 
                     library_dirs = libdirs,
                     define_macros = defines,
 
                     library_dirs = libdirs,

-                    libraries = libs + makeLibName('stc'),
+                    libraries = stcLibs,

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


@@ -716,13 +722,19 @@ if BUILD_GIZMOS:
                             [ '%s/_treelist.i' % location])
 
     ext = Extension('_gizmos',
                             [ '%s/_treelist.i' % location])
 
     ext = Extension('_gizmos',

-                    [ '%s/treelistctrl.cpp' % opj(location, 'wxCode/src') ] + swig_sources,
+                    [ '%s/treelistctrl.cpp'        % opj(location, 'wxCode/src'),
+                      '%s/gizmos/dynamicsash.cpp'  % opj(location, 'wxCode/src'),
+                      '%s/gizmos/editlbox.cpp'     % opj(location, 'wxCode/src'),
+                      '%s/gizmos/ledctrl.cpp'      % opj(location, 'wxCode/src'),
+                      '%s/gizmos/splittree.cpp'    % opj(location, 'wxCode/src'),
+                      '%s/gizmos/statpict.cpp'     % opj(location, 'wxCode/src'),
+                      ] + swig_sources,

 
                     include_dirs =  includes + [ location, opj(location, 'wxCode/include') ] + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,
 
                     include_dirs =  includes + [ location, opj(location, 'wxCode/include') ] + CONTRIBS_INC,
                     define_macros = defines,
 
                     library_dirs = libdirs,

-                    libraries = libs + makeLibName('gizmos'),
+                    libraries = libs,

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


@@ -850,6 +862,7 @@ if __name__ == "__main__":
                           'wx.lib',
                           'wx.lib.analogclock',
                           'wx.lib.analogclock.lib_setup',
                           'wx.lib',
                           'wx.lib.analogclock',
                           'wx.lib.analogclock.lib_setup',

+                          'wx.lib.art',

                           'wx.lib.colourchooser',
                           'wx.lib.editor',
                           'wx.lib.floatcanvas',
                           'wx.lib.colourchooser',
                           'wx.lib.editor',
                           'wx.lib.floatcanvas',