Merge pull request #4732 from marcelofg55/master
Added 'fat' option for bits param on scons for osx, this will produce…
This commit is contained in:
commit
2b29e7ba6f
2 changed files with 7 additions and 2 deletions
|
@ -117,7 +117,7 @@ if profile:
|
||||||
|
|
||||||
opts=Variables(customs, ARGUMENTS)
|
opts=Variables(customs, ARGUMENTS)
|
||||||
opts.Add('target', 'Compile Target (debug/release_debug/release).', "debug")
|
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('platform','Platform: '+str(platform_list)+'.',"")
|
||||||
opts.Add('p','Platform (same as platform=).',"")
|
opts.Add('p','Platform (same as platform=).',"")
|
||||||
opts.Add('tools','Build Tools (Including Editor): (yes/no)','yes')
|
opts.Add('tools','Build Tools (Including Editor): (yes/no)','yes')
|
||||||
|
@ -276,6 +276,8 @@ if selected_platform in platform_list:
|
||||||
suffix+=".32"
|
suffix+=".32"
|
||||||
elif (env["bits"]=="64"):
|
elif (env["bits"]=="64"):
|
||||||
suffix+=".64"
|
suffix+=".64"
|
||||||
|
elif (env["bits"]=="fat"):
|
||||||
|
suffix+=".fat"
|
||||||
|
|
||||||
suffix+=env.extra_suffix
|
suffix+=env.extra_suffix
|
||||||
|
|
||||||
|
|
|
@ -68,9 +68,12 @@ def configure(env):
|
||||||
if (env["bits"]=="64"):
|
if (env["bits"]=="64"):
|
||||||
env.Append(CCFLAGS=['-arch', 'x86_64'])
|
env.Append(CCFLAGS=['-arch', 'x86_64'])
|
||||||
env.Append(LINKFLAGS=['-arch', 'x86_64'])
|
env.Append(LINKFLAGS=['-arch', 'x86_64'])
|
||||||
else:
|
elif (env["bits"]=="32"):
|
||||||
env.Append(CCFLAGS=['-arch', 'i386'])
|
env.Append(CCFLAGS=['-arch', 'i386'])
|
||||||
env.Append(LINKFLAGS=['-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:
|
else:
|
||||||
#osxcross build
|
#osxcross build
|
||||||
root=os.environ.get("OSXCROSS_ROOT",0)
|
root=os.environ.get("OSXCROSS_ROOT",0)
|
||||||
|
|
Loading…
Reference in a new issue