X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85245f48ad351409d50cbecfab874827eb0f719b..44ac608d142da51fd7f70c35146245b197749b2e:/wxPython/config.py diff --git a/wxPython/config.py b/wxPython/config.py index 4089667e0a..94e9e9c76a 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 = 0 # wxPython release num for x.y.z release of wxWidgets -VER_FLAGS = "p" # 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" @@ -135,7 +135,7 @@ INSTALL_MULTIVERSION = 1 # Install the packages such that multiple versions FLAVOUR = "" # Optional flavour string to be appended to VERSION # in MULTIVERSION installs -EP_ADD_OPTS = 0 # When doing MULTIVERSION installs the wx port and +EP_ADD_OPTS = 1 # When doing MULTIVERSION installs the wx port and # ansi/unicode settings can optionally be added to the # subdir path used in site-packages @@ -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'