diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-05-21 11:34:12 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-05-21 11:34:12 +0200 |
| commit | 2b29e7ba6ff20f81dc512c14fbb0153d1ef6a201 (patch) | |
| tree | 19e5ed12b295a88da6655fe062467fc52daf12cd /platform/osx/detect.py | |
| parent | 2a6bd0c357fbc537f0e0260cf9c14101f3d53355 (diff) | |
| parent | eeb83982e2eb4b70e43d45f9fdfe5a54f08576eb (diff) | |
| download | redot-engine-2b29e7ba6ff20f81dc512c14fbb0153d1ef6a201.tar.gz | |
Merge pull request #4732 from marcelofg55/master
Added 'fat' option for bits param on scons for osx, this will produce…
Diffstat (limited to 'platform/osx/detect.py')
| -rw-r--r-- | platform/osx/detect.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 1f176dc22a..28bc42f6bb 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -68,9 +68,12 @@ def configure(env): if (env["bits"]=="64"): env.Append(CCFLAGS=['-arch', 'x86_64']) env.Append(LINKFLAGS=['-arch', 'x86_64']) - else: + elif (env["bits"]=="32"): env.Append(CCFLAGS=['-arch', 'i386']) env.Append(LINKFLAGS=['-arch', 'i386']) + else: + env.Append(CCFLAGS=['-arch', 'i386', '-arch', 'x86_64']) + env.Append(LINKFLAGS=['-arch', 'i386', '-arch', 'x86_64']) else: #osxcross build root=os.environ.get("OSXCROSS_ROOT",0) |