X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bbabc0647910d6afea914a7c295cfb761ac2423..07502d7351ab56770752ad01ee28af497cf2ab9c:/wxPython/config.py diff --git a/wxPython/config.py b/wxPython/config.py index b212052218..47d330fb44 100644 --- a/wxPython/config.py +++ b/wxPython/config.py @@ -39,7 +39,7 @@ import distutils.command.clean VER_MAJOR = 2 # The first three must match wxWidgets VER_MINOR = 7 VER_RELEASE = 0 -VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWidgets +VER_SUBREL = 1 # wxPython release num for x.y.z release of wxWidgets VER_FLAGS = "pre" # release flags, such as prerelease or RC num, etc. DESCRIPTION = "Cross platform GUI toolkit for Python" @@ -585,7 +585,11 @@ def adjustLFLAGS(lflags, libdirs, libs): else: newLFLAGS.append(flag) - return newLFLAGS + # remove any flags for universal binaries, we'll get those from + # distutils instead + return [flag for flag in newLFLAGS + if flag not in ['-isysroot', '-arch', 'ppc', 'i386'] and + not flag.startswith('/Developer') ]