diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-05 11:48:54 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-11 11:59:04 +0100 |
| commit | 511f65214fcc95011525e2f23e4d1be7cd7b8731 (patch) | |
| tree | b9ab281613cc08c3a41767a5e342fadc85821178 /platform/osx/detect.py | |
| parent | 324082471de5e923fe8d03e43085ea52e1f117e4 (diff) | |
| download | redot-engine-511f65214fcc95011525e2f23e4d1be7cd7b8731.tar.gz | |
SCons: Streamline Vulkan buildsystem + fixups
- Renamed option to `builtin_vulkan`, since that's the name of the
library and if we were to add new components, we'd likely use that
same option.
- Merge `vulkan_loader/SCsub` in `vulkan/SCsub`.
- Accordingly, don't use built-in Vulkan headers when not building
against the built-in loader library.
- Drop Vulkan registry which we don't appear to need currently.
- Style and permission fixes.
Diffstat (limited to 'platform/osx/detect.py')
| -rw-r--r-- | platform/osx/detect.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py index c4e8779523..0b164a2c56 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -154,16 +154,15 @@ def configure(env): 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.Prepend(CPPPATH=['#thirdparty/vulkan/include/', "#thirdparty/vulkan/registry/"]) env.Append(CPPDEFINES=['VULKAN_ENABLED']) - - #env.Append(CPPDEFINES=['GLES_ENABLED', 'OPENGL_ENABLED']) - env.Append(LINKFLAGS=['-framework', 'Metal', '-framework', 'QuartzCore', '-framework', 'IOSurface']) if (env['use_static_mvk']): env.Append(LINKFLAGS=['-framework', 'MoltenVK']) - elif not env["builtin_vulkan_loader"]: + env['builtin_vulkan'] = False + elif not env['builtin_vulkan']: env.Append(LIBS=['vulkan']) + #env.Append(CPPDEFINES=['GLES_ENABLED', 'OPENGL_ENABLED']) + env.Append(CCFLAGS=['-mmacosx-version-min=10.11']) env.Append(LINKFLAGS=['-mmacosx-version-min=10.11']) |