Commit bbff6c0d authored by Marco Serantoni's avatar Marco Serantoni

[MacOSX] Adding patches for wxPython && http://trac.wxwidgets.org/ticket/15957

parent d6f348f4
...@@ -69,7 +69,7 @@ ExternalProject_Add( libwxpython ...@@ -69,7 +69,7 @@ ExternalProject_Add( libwxpython
PATCH_COMMAND bzr revert PATCH_COMMAND bzr revert
COMMAND bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/wxpython-3.0.0_macosx.patch" COMMAND bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/wxpython-3.0.0_macosx.patch"
#COMMAND bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/wxwidgets-3.0.0_macosx_bug_15908.patch" COMMAND bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/wxpython-3.0.0_macosx_multiarch.patch" # http://trac.wxwidgets.org/ticket/15957
UPDATE_COMMAND ${CMAKE_COMMAND} -E remove_directory "${LIBWXPYTHON_ROOT}" UPDATE_COMMAND ${CMAKE_COMMAND} -E remove_directory "${LIBWXPYTHON_ROOT}"
COMMAND ${LIBWXPYTHON_EXEC} wxPython/build-wxpython.py --clean COMMAND ${LIBWXPYTHON_EXEC} wxPython/build-wxpython.py --clean
......
This diff is collapsed.
=== modified file 'wxPython/config.py'
--- wxPython/config.py 2014-02-07 20:23:11 +0000
+++ wxPython/config.py 2014-02-07 21:00:18 +0000
@@ -22,6 +22,7 @@
import sys, os, glob, fnmatch, tempfile
import subprocess
+import re
EGGing = 'bdist_egg' in sys.argv or 'egg_info' in sys.argv
if not EGGing:
@@ -1059,10 +1060,8 @@
libs = ['stdc++']
NO_SCRIPTS = 1
if ARCH != "":
- cflags.append("-arch")
- cflags.append(ARCH)
- lflags.append("-arch")
- lflags.append(ARCH)
+ cflags.append('-arch ' + re.sub(',',' -arch ',ARCH))
+ lflags.append('-arch ' + re.sub(',',' -arch ',ARCH))
if not os.environ.get('CC') or not os.environ.get('CXX'):
os.environ["CXX"] = getWxConfigValue('--cxx')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment