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/x11 | |
| parent | 324082471de5e923fe8d03e43085ea52e1f117e4 (diff) | |
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/x11')
| -rw-r--r-- | platform/x11/detect.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index ed48fbb74a..ddb3af79f8 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -320,10 +320,9 @@ def configure(env): env.Prepend(CPPPATH=['#platform/x11']) env.Append(CPPDEFINES=['X11_ENABLED', 'UNIX_ENABLED']) - env.Prepend(CPPPATH=['#thirdparty/vulkan/include/', "#thirdparty/vulkan/registry/"]) env.Append(CPPDEFINES=['VULKAN_ENABLED']) - if not env["builtin_vulkan_loader"]: - env.Append(LIBS=['vulkan']) + if not env['builtin_vulkan']: + env.ParseConfig('pkg-config vulkan --cflags --libs') #env.Append(CPPDEFINES=['OPENGL_ENABLED']) env.Append(LIBS=['GL']) |