fixing CW 8 builds for all targets

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 3d3e6aafd2bb51f83874646e5d3a3cc9b85c80a5..6b8d5199e68e9abd9058363f137c8a993ac70245 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -37,10 +37,10 @@ import distutils.command.clean
 #----------------------------------------------------------------------
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
-VER_MINOR        = 5
-VER_RELEASE      = 5
-VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS        = ""     # release flags, such as prerelease num, unicode, etc.
+VER_MINOR        = 6
+VER_RELEASE      = 0
+VER_SUBREL       = 0      # 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"
@@ -234,6 +234,7 @@ if sys.platform[:6] == "darwin":
 if os.name == 'nt':
     WXPORT = 'msw'
 
+WXPYTHON_TYPE_TABLE = '_wxPython_table'
 
 #----------------------------------------------------------------------
 # Check for build flags on the command line
@@ -679,7 +680,7 @@ if os.name == 'nt':
                 (WXPLAT, None),
                 ('WXUSINGDLL', '1'),
 
-                ('SWIG_TYPE_TABLE', '_wxPython_table'),
+                ('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),
                 ('WXP_USE_THREAD', '1'),
                 ]
 
@@ -733,7 +734,7 @@ if os.name == 'nt':
 elif os.name == 'posix':
     WXDIR = '..'
     includes = ['include', 'src']
-    defines = [('SWIG_TYPE_TABLE', 'wxPython_type_table'),
+    defines = [('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),
                ('HAVE_CONFIG_H', None),
                ('WXP_USE_THREAD', '1'),
                ]