added a test to check how exception handling works with Win32 SEH; corrected copyright

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index f86d77a1c3f594a17ce06907ba19eefff8b23c79..c10120bbda5b7afca6d9c3b79e58b291cf339bb7 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -137,7 +137,6 @@ else:
 
 
 ext = Extension('_core_', ['src/helpers.cpp',
 
 
 ext = Extension('_core_', ['src/helpers.cpp',

-                           'src/libpy.c',

                            ] + rc_file + swig_sources,
 
                 include_dirs = includes,
                            ] + rc_file + swig_sources,
 
                 include_dirs = includes,


@@ -293,6 +292,7 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
                           'src/_dnd.i',
                           'src/_display.i',
                           'src/_clipbrd.i',
                           'src/_dnd.i',
                           'src/_display.i',
                           'src/_clipbrd.i',

+                          'src/_stdpaths.i',

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


@@ -355,6 +355,22 @@ ext = Extension('_html', swig_sources,
 wxpExtensions.append(ext)
 
 
 wxpExtensions.append(ext)
 
 

+mediaLibs = libs[:]
+if not MONOLITHIC and os.name == 'nt':
+    mediaLibs.append(makeLibName('media')[0])
+swig_sources = run_swig(['media.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force, swig_args, swig_deps)
+ext = Extension('_media', swig_sources,
+                include_dirs =  includes,
+                define_macros = defines,
+                library_dirs = libdirs,
+                libraries = mediaLibs,
+                extra_compile_args = cflags,
+                extra_link_args = lflags,
+                **depends
+                )
+wxpExtensions.append(ext)
+

 
 swig_sources = run_swig(['webkit.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 
 swig_sources = run_swig(['webkit.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)