X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef407a4e1131916040f6fa2369441a65544277bb..f78e4942ec0f3f6abd2992502e2d6c5c2e8e55f6:/wxPython/config.py?ds=sidebyside

diff --git a/wxPython/config.py b/wxPython/config.py
index 31735f0c18..158d6e79a3 100644
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -39,8 +39,8 @@ import distutils.command.clean
 VER_MAJOR        = 2      # The first three must match wxWidgets
 VER_MINOR        = 5
 VER_RELEASE      = 3
-VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS        = "rc3"     # release flags, such as prerelease num, unicode, etc.
+VER_SUBREL       = 3      # wxPython release num for x.y.z release of wxWidgets
+VER_FLAGS        = "pre"     # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
@@ -644,7 +644,7 @@ if os.name == 'nt':
                 (WXPLAT, None),
                 ('WXUSINGDLL', '1'),
 
-                ('SWIG_GLOBAL', None),
+                ('SWIG_TYPE_TABLE', 'wxPython_type_table'),
                 ('WXP_USE_THREAD', '1'),
                 ]
 
@@ -698,7 +698,7 @@ if os.name == 'nt':
 elif os.name == 'posix':
     WXDIR = '..'
     includes = ['include', 'src']
-    defines = [('SWIG_GLOBAL', None),
+    defines = [('SWIG_TYPE_TABLE', 'wxPython_type_table'),
                ('HAVE_CONFIG_H', None),
                ('WXP_USE_THREAD', '1'),
                ]
@@ -733,7 +733,7 @@ elif os.name == 'posix':
     WXPREFIX   = os.popen(WX_CONFIG + ' --prefix').read()[:-1]
 
 
-    if sys.platform[:6] == "darwin":
+    if sys.platform[:6] == "darwin" and WXPORT == 'mac':
         # Flags and such for a Darwin (Max OS X) build of Python
         WXPLAT = '__WXMAC__'
         GENDIR = 'mac'
@@ -813,7 +813,6 @@ swig_args = ['-c++',
 
              '-I' + opj(WXPY_SRC, 'src'),
              '-D'+WXPLAT,
-             '-noruntime'
              ]
 if UNICODE:
     swig_args.append('-DwxUSE_UNICODE')
@@ -823,10 +822,7 @@ if FULL_DOCS:
     
 
 swig_deps = [ opj(WXPY_SRC, 'src/my_typemaps.i'),
-              opj(WXPY_SRC, 'src/my_fragments.i'),
-              opj(WXPY_SRC, 'src/common.swg'),
-              opj(WXPY_SRC, 'src/pyrun.swg'),
-              opj(WXPY_SRC, 'src/python.swg'),
+              opj(WXPY_SRC, 'src/pyfragments.swg'),
               ]
 
 depends = [ #'include/wx/wxPython/wxPython.h',