(blind) GTK1 compilation fix

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 566b4f8b616470dd7e9494afd64319caa662df42..23e701403f03a67ea6e0d26187ee8a86e3c79306 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -11,7 +11,7 @@
 # Licence:     wxWindows license
 #----------------------------------------------------------------------
 
 # Licence:     wxWindows license
 #----------------------------------------------------------------------
 

-import sys
+import sys, os

 
 
 # The full contents of the wx.build.config module used to be located
 
 
 # The full contents of the wx.build.config module used to be located


@@ -29,6 +29,14 @@ import sys
 # config .py in the same place as setup.py, and then copy it to
 # wx/build as needed below.
 
 # config .py in the same place as setup.py, and then copy it to
 # wx/build as needed below.
 

+# To fully support external builds, we need to have a build options
+# file that is created whenever a new wxPython build is performed.
+# We happen to be doing that in this script, so make sure to remove
+# the build_options.py file, so that config.py will recreate it.
+
+if os.path.exists("build_options.py"):
+    os.remove("build_options.py")
+

 sys.setup_is_main =  __name__ == "__main__"  # an icky hack!
 from config import *
 
 sys.setup_is_main =  __name__ == "__main__"  # an icky hack!
 from config import *
 


@@ -38,7 +46,9 @@ from config import *
 #----------------------------------------------------------------------
 
 copy_file('config.py', 'wx/build', update=1, verbose=1)
 #----------------------------------------------------------------------
 
 copy_file('config.py', 'wx/build', update=1, verbose=1)

+copy_file('build_options.py', 'wx/build', update=1, verbose=1)

 CLEANUP.append('wx/build/config.py')
 CLEANUP.append('wx/build/config.py')

+CLEANUP.append('wx/build/build_options.py')

 
 #----------------------------------------------------------------------
 # Update the version file
 
 #----------------------------------------------------------------------
 # Update the version file


@@ -137,7 +147,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,


@@ -255,6 +264,7 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
                           'src/_pycontrol.i',
                           'src/_cshelp.i',
                           'src/_dragimg.i',
                           'src/_pycontrol.i',
                           'src/_cshelp.i',
                           'src/_dragimg.i',

+                          'src/_datectrl.i',

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


@@ -356,14 +366,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