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 566b4f8b616470dd7e9494afd64319caa662df42..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,


@@ -356,14 +355,16 @@ 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,
 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 = libs,
+                libraries = mediaLibs,

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