diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-11 16:01:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 16:01:55 +0100 |
| commit | 1eb424ec9549bdd086dfb54c847d107519be73d9 (patch) | |
| tree | d9a3ec0c72f3a4eda02e16ed883f560e02cf1ccf /platform/x11/detect.py | |
| parent | 3e3f8a47616327d7faeb17f558bb81a943385e82 (diff) | |
| parent | db81928e08cb58d5f67908c6dfcf9433e572ffe8 (diff) | |
Merge pull request #36098 from godotengine/vulkan
Add initial Vulkan support, master branch goes UNSTABLE
Diffstat (limited to 'platform/x11/detect.py')
| -rw-r--r-- | platform/x11/detect.py | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index bd5e5e0812..9d5affcb3c 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -318,8 +318,19 @@ def configure(env): env.ParseConfig('pkg-config zlib --cflags --libs') env.Prepend(CPPPATH=['#platform/x11']) - env.Append(CPPDEFINES=['X11_ENABLED', 'UNIX_ENABLED', 'OPENGL_ENABLED', 'GLES_ENABLED']) - env.Append(LIBS=['GL', 'pthread']) + env.Append(CPPDEFINES=['X11_ENABLED', 'UNIX_ENABLED']) + + env.Append(CPPDEFINES=['VULKAN_ENABLED']) + if not env['builtin_vulkan']: + env.ParseConfig('pkg-config vulkan --cflags --libs') + if not env['builtin_glslang']: + # No pkgconfig file for glslang so far + env.Append(LIBS=['glslang', 'SPIRV']) + + #env.Append(CPPDEFINES=['OPENGL_ENABLED']) + env.Append(LIBS=['GL']) + + env.Append(LIBS=['pthread']) if (platform.system() == "Linux"): env.Append(LIBS=['dl']) |