diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-31 14:29:05 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-31 14:29:05 +0100 |
| commit | 9188bc734155e14c97e24649a22213b625b9b6cf (patch) | |
| tree | 993d3951ef28137ec0284e703356e090e89b73fd /platform/windows | |
| parent | cd25e48456e58704f1450954a0c94b1e7fe079f4 (diff) | |
| parent | 4dd8f68120bc3d3be94e0556ccfef9ee4bf8311a (diff) | |
Merge pull request #67879 from bruvzg/fix_no_vlk
Fix build with Vulkan disabled and no Vulkan headers installed.
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/detect.py | 12 | ||||
| -rw-r--r-- | platform/windows/vulkan_context_win.h | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 74868fc6a2..705e83dace 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -582,12 +582,14 @@ def configure_mingw(env): ] ) - env.Append(CPPDEFINES=["VULKAN_ENABLED"]) - if not env["use_volk"]: - env.Append(LIBS=["vulkan"]) + if env["vulkan"]: + env.Append(CPPDEFINES=["VULKAN_ENABLED"]) + if not env["use_volk"]: + env.Append(LIBS=["vulkan"]) - env.Append(CPPDEFINES=["GLES3_ENABLED"]) - env.Append(LIBS=["opengl32"]) + if env["opengl3"]: + env.Append(CPPDEFINES=["GLES3_ENABLED"]) + env.Append(LIBS=["opengl32"]) env.Append(CPPDEFINES=["MINGW_ENABLED", ("MINGW_HAS_SECURE_API", 1)]) diff --git a/platform/windows/vulkan_context_win.h b/platform/windows/vulkan_context_win.h index 2ecdfc8f3f..9dedcabb2b 100644 --- a/platform/windows/vulkan_context_win.h +++ b/platform/windows/vulkan_context_win.h @@ -31,6 +31,8 @@ #ifndef VULKAN_CONTEXT_WIN_H #define VULKAN_CONTEXT_WIN_H +#ifdef VULKAN_ENABLED + #include "drivers/vulkan/vulkan_context.h" #define WIN32_LEAN_AND_MEAN @@ -46,4 +48,6 @@ public: ~VulkanContextWindows(); }; +#endif // VULKAN_ENABLED + #endif // VULKAN_CONTEXT_WIN_H |