Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
0e42a2ff
Commit
0e42a2ff
authored
Feb 15, 2014
by
Marco Serantoni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[MacOSX] wxPython patch revised for
http://trac.wxwidgets.org/ticket/15957
parent
fb9e5b94
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
wxpython-3.0.0_macosx_multiarch.patch
patches/wxpython-3.0.0_macosx_multiarch.patch
+6
-5
No files found.
patches/wxpython-3.0.0_macosx_multiarch.patch
View file @
0e42a2ff
=== modified file 'wxPython/config.py'
--- wxPython/config.py 2014-02-
08 12:23:31
+0000
+++ wxPython/config.py 2014-02-
08 13:58:07
+0000
--- wxPython/config.py 2014-02-
15 10:10:05
+0000
+++ wxPython/config.py 2014-02-
15 18:05:33
+0000
@@ -22,6 +22,7 @@
import sys, os, glob, fnmatch, tempfile
...
...
@@ -9,7 +9,7 @@
EGGing = 'bdist_egg' in sys.argv or 'egg_info' in sys.argv
if not EGGing:
@@ -1059,10 +1060,
8
@@
@@ -1059,10 +1060,
9
@@
libs = ['stdc++']
NO_SCRIPTS = 1
if ARCH != "":
...
...
@@ -17,8 +17,9 @@
- cflags.append(ARCH)
- lflags.append("-arch")
- lflags.append(ARCH)
+ cflags.append("-arch " + re.sub(","," -arch ",ARCH))
+ #lflags.append("-arch " + re.sub(","," -arch ",ARCH))
+ splitArch = "-arch " + re.sub(","," -arch ",ARCH)
+ cflags.extend(splitArch.split(' '))
+ lflags.extend(splitArch.split(' '))
if not os.environ.get('CC') or not os.environ.get('CXX'):
os.environ["CXX"] = getWxConfigValue('--cxx')
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment