Skip to content

Commit c05a3bd

Browse files
committed
Conan: Update glslang for GCC 15 build fixes
1 parent 7471e1e commit c05a3bd

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

conanfile.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ class MikageConan(ConanFile):
1313
"sdl/2.30.7", # 2.0.18 fixed swapped X/Y buttons on Switch Pro Controller
1414
"range-v3/0.12.0",
1515
"catch2/2.13.7",
16-
"glslang/1.3.268.0",
17-
"spirv-tools/1.3.268.0",
1816
"tracy/0.11.1",
1917
"xxhash/0.8.0",
2018
"fmt/11.2.0",
@@ -53,7 +51,13 @@ def requirements(self):
5351
self.requires("libunwind/1.8.0")
5452

5553
if self.settings.os == "Macos":
54+
self.requires("glslang/1.3.268.0")
55+
self.requires("spirv-tools/1.3.268.0")
5656
self.requires("vulkan-loader/1.3.268.0", force=True)
5757
self.requires("spirv-cross/1.3.268.0", force=True) # for moltenvk
5858
self.requires("moltenvk/1.2.2", force=True)
5959
self.requires("vulkan-headers/1.3.268.0", force=True) # must be a direct dependency to avoid homebrew headers from being pulled in
60+
else:
61+
# More recent version required for GCC 15 build fixes
62+
self.requires("glslang/1.4.313.0")
63+
self.requires("spirv-tools/1.4.313.0")

0 commit comments

Comments
 (0)