X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6be3205071f38f09b9a9b282447a4d7e374c5a53..17fce800d584151423ab1ff04bac4f3b785dff7d:/wxPython/config.py diff --git a/wxPython/config.py b/wxPython/config.py index 851c315f89..6b8d5199e6 100644 --- a/wxPython/config.py +++ b/wxPython/config.py @@ -37,8 +37,8 @@ import distutils.command.clean #---------------------------------------------------------------------- VER_MAJOR = 2 # The first three must match wxWidgets -VER_MINOR = 5 -VER_RELEASE = 5 +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. @@ -82,6 +82,7 @@ BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module BUILD_OGL = 0 # If true, build the contrib/ogl extension module BUILD_STC = 1 # If true, build the contrib/stc extension module BUILD_GIZMOS = 1 # Build a module for the gizmos contrib library +BUILD_ANIMATE = 1 # Build a module for the animate contrib library BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets # to be loaded from a DLL and to be used from Python. @@ -233,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 @@ -678,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'), ] @@ -732,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'), ]