2014-02-07 22:00:19 +00:00
|
|
|
=== modified file 'wxPython/config.py'
|
2014-02-15 18:09:14 +00:00
|
|
|
--- wxPython/config.py 2014-02-15 10:10:05 +0000
|
|
|
|
|
+++ wxPython/config.py 2014-02-15 18:05:33 +0000
|
2014-02-07 22:00:19 +00:00
|
|
|
@@ -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:
|
2014-02-15 18:09:14 +00:00
|
|
|
@@ -1059,10 +1060,9 @@
|
2014-02-07 22:00:19 +00:00
|
|
|
libs = ['stdc++']
|
|
|
|
|
NO_SCRIPTS = 1
|
|
|
|
|
if ARCH != "":
|
|
|
|
|
- cflags.append("-arch")
|
|
|
|
|
- cflags.append(ARCH)
|
|
|
|
|
- lflags.append("-arch")
|
|
|
|
|
- lflags.append(ARCH)
|
2014-02-15 18:09:14 +00:00
|
|
|
+ splitArch = "-arch " + re.sub(","," -arch ",ARCH)
|
|
|
|
|
+ cflags.extend(splitArch.split(' '))
|
|
|
|
|
+ lflags.extend(splitArch.split(' '))
|
2014-02-07 22:00:19 +00:00
|
|
|
|
|
|
|
|
if not os.environ.get('CC') or not os.environ.get('CXX'):
|
|
|
|
|
os.environ["CXX"] = getWxConfigValue('--cxx')
|
|
|
|
|
|
