Selaa lähdekoodia

Revert "Change LINKFLAGS to FRAMEWORKS which is supported since"

This reverts commit c924e83a646f8a6d972ccd4d009acc323a6be158.

SCons `FRAMEWORKS` is, according to their latest docs, only supported
"On Mac OS X with gcc". While the "with gcc" part seems bogus, #36795
did introduce a link failure for our osxcross toolchain for compiling
macOS binaries from Linux. SCons probably fails to detect this as a
macOS target and does not use its `FRAMEWORKS` logic properly.

So using `LINKFLAGS` as we used to is the more portable solution.
Rémi Verschelde 5 vuotta sitten
vanhempi
commit
1f6c9328dd
1 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 3 3
      platform/osx/detect.py

+ 3 - 3
platform/osx/detect.py

@@ -151,13 +151,13 @@ def configure(env):
 
 
     env.Prepend(CPPPATH=['#platform/osx'])
     env.Prepend(CPPPATH=['#platform/osx'])
     env.Append(CPPDEFINES=['OSX_ENABLED', 'UNIX_ENABLED', 'APPLE_STYLE_KEYS', 'COREAUDIO_ENABLED', 'COREMIDI_ENABLED'])
     env.Append(CPPDEFINES=['OSX_ENABLED', 'UNIX_ENABLED', 'APPLE_STYLE_KEYS', 'COREAUDIO_ENABLED', 'COREMIDI_ENABLED'])
-    env.AppendUnique(FRAMEWORKS=['Cocoa', 'Carbon', 'AudioUnit', 'CoreAudio', 'CoreMIDI', 'IOKit', 'ForceFeedback', 'CoreVideo', 'AVFoundation', 'CoreMedia'])
+    env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'AudioUnit', '-framework', 'CoreAudio', '-framework', 'CoreMIDI', '-framework', 'IOKit', '-framework', 'ForceFeedback', '-framework', 'CoreVideo', '-framework', 'AVFoundation', '-framework', 'CoreMedia'])
     env.Append(LIBS=['pthread', 'z'])
     env.Append(LIBS=['pthread', 'z'])
 
 
     env.Append(CPPDEFINES=['VULKAN_ENABLED'])
     env.Append(CPPDEFINES=['VULKAN_ENABLED'])
-    env.AppendUnique(FRAMEWORKS=['Metal', 'QuartzCore', 'IOSurface'])
+    env.Append(LINKFLAGS=['-framework', 'Metal', '-framework', 'QuartzCore', '-framework', 'IOSurface'])
     if (env['use_static_mvk']):
     if (env['use_static_mvk']):
-        env.AppendUnique(FRAMEWORKS=['MoltenVK'])
+        env.Append(LINKFLAGS=['-framework', 'MoltenVK'])
         env['builtin_vulkan'] = False
         env['builtin_vulkan'] = False
     elif not env['builtin_vulkan']:
     elif not env['builtin_vulkan']:
         env.Append(LIBS=['vulkan'])
         env.Append(LIBS=['vulkan'])