diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-29 20:44:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 11:57:40 +0100 |
| commit | 6289e7d1479f6e7c9e55890c8c66d2e5e0a1481a (patch) | |
| tree | 8223d907b1aa8184295240a7b6f63023da05c02f /platform/x11/detect.py | |
| parent | 6ecedd1e6ca7d8b10b13a3dab19074fd51b17bcf (diff) | |
| parent | b456bfad5cee3922f55621bf7c133cc67337636a (diff) | |
| download | redot-engine-6289e7d1479f6e7c9e55890c8c66d2e5e0a1481a.tar.gz | |
Merge pull request #29993 from bruvzg/vulkan
Initial Vulkan support for macOS (MoltenVK) and Windows
Diffstat (limited to 'platform/x11/detect.py')
| -rw-r--r-- | platform/x11/detect.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 5f43d19151..ed48fbb74a 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -319,9 +319,16 @@ 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']) - env.Append(LIBS=['vulkan']) - env.Append(LIBS=['GL', 'pthread']) + if not env["builtin_vulkan_loader"]: + env.Append(LIBS=['vulkan']) + + #env.Append(CPPDEFINES=['OPENGL_ENABLED']) + env.Append(LIBS=['GL']) + + env.Append(LIBS=['pthread']) if (platform.system() == "Linux"): env.Append(LIBS=['dl']) |