summaryrefslogtreecommitdiff
path: root/src/render/meson.build
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2026-09-07 15:06:14 -0400
committerAndrew Opalach <andrew@akon.city> 2026-09-07 15:06:14 -0400
commitc66c7c64ebd16287b892f8a780cffcabafba3799 (patch)
treeb2195902ef055147878b591cf1171be7e6133c97 /src/render/meson.build
parent1758ae9e860bd3b65b661e3c804288c3599f4fd4 (diff)
downloadcamu-c66c7c64ebd16287b892f8a780cffcabafba3799.tar.gz
camu-c66c7c64ebd16287b892f8a780cffcabafba3799.tar.bz2
camu-c66c7c64ebd16287b892f8a780cffcabafba3799.zip
Better OSD behavior, lots of build stuff
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src/render/meson.build')
-rw-r--r--src/render/meson.build8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/meson.build b/src/render/meson.build
index ee0017a..3cbca4c 100644
--- a/src/render/meson.build
+++ b/src/render/meson.build
@@ -56,9 +56,8 @@ elif get_option('renderer') == 'libplacebo'
shaderc_opts.add_cmake_defines({ 'SPIRV_COLOR_TERMINAL': false })
shaderc_opts.add_cmake_defines({ 'ENABLE_EXCEPTIONS_ON_MSVC': false })
shaderc_proj = cmake.subproject('shaderc', options: shaderc_opts)
- shaderc = shaderc_proj.dependency('shaderc')
- meson.override_dependency('shaderc', declare_dependency(dependencies: shaderc, version: '2026.2'))
- render_deps += [
+ shaderc_deps = [
+ shaderc_proj.dependency('shaderc'),
shaderc_proj.dependency('shaderc_util'),
shaderc_proj.dependency('MachineIndependent'),
shaderc_proj.dependency('OSDependent'),
@@ -68,8 +67,9 @@ elif get_option('renderer') == 'libplacebo'
shaderc_proj.dependency('SPIRV-Tools-static')
]
if spirv_optimizer
- render_deps += [shaderc_proj.dependency('SPIRV-Tools-opt')]
+ shaderc_deps += [shaderc_proj.dependency('SPIRV-Tools-opt')]
endif
+ meson.override_dependency('shaderc', declare_dependency(dependencies: shaderc_deps, version: '2026.3'))
endif
libplacebo_opts += ['shaderc=enabled', 'glslang=disabled']
else