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 | |
| parent | 2a6bd0c357fbc537f0e0260cf9c14101f3d53355 (diff) | |
| parent | eeb83982e2eb4b70e43d45f9fdfe5a54f08576eb (diff) | |
Merge pull request #4732 from marcelofg55/master
Added 'fat' option for bits param on scons for osx, this will produce…
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | platform/osx/detect.py | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 3ea40489be..8a3a7c4565 100644 --- a/SConstruct +++ b/SConstruct @@ -117,7 +117,7 @@ if profile: opts=Variables(customs, ARGUMENTS) opts.Add('target', 'Compile Target (debug/release_debug/release).', "debug") -opts.Add('bits', 'Compile Target Bits (default/32/64).', "default") +opts.Add('bits', 'Compile Target Bits (default/32/64/fat).', "default") opts.Add('platform','Platform: '+str(platform_list)+'.',"") opts.Add('p','Platform (same as platform=).',"") opts.Add('tools','Build Tools (Including Editor): (yes/no)','yes') @@ -276,6 +276,8 @@ if selected_platform in platform_list: suffix+=".32" elif (env["bits"]=="64"): suffix+=".64" + elif (env["bits"]=="fat"): + suffix+=".fat" suffix+=env.extra_suffix 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) |