Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OSX] Add universal build support.

pull/637/head
Fabio Alessandrelli 2021-10-01 19:24:48 +02:00
parent 99e9dd1d93
commit a1337a2dd7
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
SConstruct
View File

@ -151,8 +151,8 @@ opts.Add(
opts.Add(EnumVariable( opts.Add(EnumVariable(
'macos_arch', 'macos_arch',
'Target macOS architecture', 'Target macOS architecture',
'x86_64', 'universal',
['x86_64', 'arm64'] ['universal', 'x86_64', 'arm64']
)) ))
opts.Add(EnumVariable( opts.Add(EnumVariable(
'ios_arch', 'ios_arch',
@ -228,7 +228,14 @@ elif env['platform'] == 'osx':
'Only 64-bit builds are supported for the macOS target.' 'Only 64-bit builds are supported for the macOS target.'
) )
env.Append(CCFLAGS=['-std=c++14', '-arch', env['macos_arch']]) if env["macos_arch"] == "universal":
env.Append(LINKFLAGS=["-arch", "x86_64", "-arch", "arm64"])
env.Append(CCFLAGS=["-arch", "x86_64", "-arch", "arm64"])
else:
env.Append(LINKFLAGS=["-arch", env["macos_arch"]])
env.Append(CCFLAGS=["-arch", env["macos_arch"]])
env.Append(CCFLAGS=['-std=c++14'])
if env['macos_deployment_target'] != 'default': if env['macos_deployment_target'] != 'default':
env.Append(CCFLAGS=['-mmacosx-version-min=' + env['macos_deployment_target']]) env.Append(CCFLAGS=['-mmacosx-version-min=' + env['macos_deployment_target']])
@ -239,8 +246,6 @@ elif env['platform'] == 'osx':
env.Append(LINKFLAGS=['-isysroot', env['macos_sdk_path']]) env.Append(LINKFLAGS=['-isysroot', env['macos_sdk_path']])
env.Append(LINKFLAGS=[ env.Append(LINKFLAGS=[
'-arch',
env['macos_arch'],
'-framework', '-framework',
'Cocoa', 'Cocoa',
'-Wl,-undefined,dynamic_lookup', '-Wl,-undefined,dynamic_lookup',
@ -472,7 +477,7 @@ if env['platform'] == 'android':
elif env['platform'] == 'ios': elif env['platform'] == 'ios':
arch_suffix = env['ios_arch'] arch_suffix = env['ios_arch']
elif env['platform'] == 'osx': elif env['platform'] == 'osx':
if env['macos_arch'] != 'x86_64': if env['macos_arch'] != 'universal':
arch_suffix = env['macos_arch'] arch_suffix = env['macos_arch']
elif env['platform'] == 'javascript': elif env['platform'] == 'javascript':
arch_suffix = 'wasm' arch_suffix = 'wasm'