diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-05 15:21:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-05 15:21:26 +0100 |
| commit | 5ea8b1692a8929861ecc52d6be208df60e2402ab (patch) | |
| tree | b8befa93c6779ba7ace3ac266b35d1a1e2d6e7da /platform | |
| parent | 54a8bad8fe8706a76315ceded6d13c14b697e8e8 (diff) | |
| parent | c924e83a646f8a6d972ccd4d009acc323a6be158 (diff) | |
Merge pull request #36795 from hungrymonkey/issue_36720
Change LINKFLAGS to FRAMEWORKS which is supported since Scons release 0.96.91
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/detect.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 12ca5c10dc..b2f4032f66 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -151,13 +151,13 @@ def configure(env): env.Prepend(CPPPATH=['#platform/osx']) env.Append(CPPDEFINES=['OSX_ENABLED', 'UNIX_ENABLED', 'APPLE_STYLE_KEYS', 'COREAUDIO_ENABLED', 'COREMIDI_ENABLED']) - env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'AudioUnit', '-framework', 'CoreAudio', '-framework', 'CoreMIDI', '-framework', 'IOKit', '-framework', 'ForceFeedback', '-framework', 'CoreVideo', '-framework', 'AVFoundation', '-framework', 'CoreMedia']) + env.AppendUnique(FRAMEWORKS=['Cocoa', 'Carbon', 'AudioUnit', 'CoreAudio', 'CoreMIDI', 'IOKit', 'ForceFeedback', 'CoreVideo', 'AVFoundation', 'CoreMedia']) env.Append(LIBS=['pthread', 'z']) env.Append(CPPDEFINES=['VULKAN_ENABLED']) - env.Append(LINKFLAGS=['-framework', 'Metal', '-framework', 'QuartzCore', '-framework', 'IOSurface']) + env.AppendUnique(FRAMEWORKS=['Metal', 'QuartzCore', 'IOSurface']) if (env['use_static_mvk']): - env.Append(LINKFLAGS=['-framework', 'MoltenVK']) + env.AppendUnique(FRAMEWORKS=['MoltenVK']) env['builtin_vulkan'] = False elif not env['builtin_vulkan']: env.Append(LIBS=['vulkan']) |