removed unused APPEND_STR macro

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index bde1e2615103381bf313ceefb81e77089ca139e1..28f221b0df163be5161c302a1ff2f56052afe0cf 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -508,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')


@@ -626,7 +627,7 @@ if BUILD_STC:
     msg('Preparing STC...')
     location = 'contrib/stc'
     #if os.name == 'nt':
     msg('Preparing STC...')
     location = 'contrib/stc'
     #if os.name == 'nt':

-    STC_H = opj(WXDIR, 'contrib', 'include/wx/stc')
+    STC_H = opj(WXDIR, 'include/wx/stc')

     #else:
     #    STC_H = opj(WXPREFIX, 'include/wx-%d.%d/wx/stc' % (VER_MAJOR, VER_MINOR))
 
     #else:
     #    STC_H = opj(WXPREFIX, 'include/wx-%d.%d/wx/stc' % (VER_MAJOR, VER_MINOR))
 


@@ -655,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,
 


@@ -662,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,


@@ -717,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,