From 4dc2d78d2e939ce07768c83ed18cf978292cffc4 Mon Sep 17 00:00:00 2001
From: marcelofg55 <marcelofg55@gmail.com>
Date: Fri, 20 May 2016 17:31:30 -0300
Subject: [PATCH] Added 'fat' option for bits param on scons for osx, this will
 produce a fat binary that contains both 32 bits and 64 bits binaries

(cherry picked from commit eeb83982e2eb4b70e43d45f9fdfe5a54f08576eb)
---
 SConstruct             | 4 +++-
 platform/osx/detect.py | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index 3ea40489be9..8a3a7c45653 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 1f176dc22a1..28bc42f6bb9 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)