X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e19b9131cb2d7c0f5d05dc75889172de49f788d0..b4eecebd423df0c6efe86d7658cd3df818d67ed8:/wxPython/setup.py diff --git a/wxPython/setup.py b/wxPython/setup.py index 0960cd8487..1e6cbd820c 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -189,8 +189,7 @@ 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', @@ -233,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', @@ -267,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', @@ -293,6 +288,7 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR, 'src/_datectrl.i', 'src/_hyperlink.i', 'src/_picker.i', + 'src/_collpane.i', ], True) ext = Extension('_controls_', swig_sources, @@ -312,9 +308,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', @@ -367,6 +361,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, @@ -397,7 +405,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) @@ -445,14 +453,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 = [] @@ -474,7 +482,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 = [] @@ -500,7 +508,7 @@ swig_sources = run_swig(['aui.i'], 'src', GENDIR, PKGDIR, opj(WXDIR, 'include/wx/aui/dockart.h'), opj(WXDIR, 'include/wx/aui/auibook.h'), ]) -if not MONOLITHIC: +if not MONOLITHIC and findLib('aui', libdirs): auiLib = makeLibName('aui') else: auiLib = [] @@ -793,6 +801,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))