Skip to content

Commit

Permalink
build: merian: move shaderc src to subdir
Browse files Browse the repository at this point in the history
  • Loading branch information
LDAP committed Nov 7, 2024
1 parent 1f99c59 commit 5eab4e5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
7 changes: 0 additions & 7 deletions src/merian/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,6 @@ merian_src = files(
'vk/window/swapchain.cpp',
)

if shaderc.found()
merian_src += files('vk/shader/shader_compiler_shaderc.cpp')
add_project_arguments('-DMERIAN_SHADERC_FOUND', language: 'cpp')
else
merian_src += files('vk/shader/shader_compiler_shaderc_stub.cpp')
endif

subdir('vk/shader')

merian_lib = static_library(
Expand Down
7 changes: 7 additions & 0 deletions src/merian/vk/shader/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,10 @@ merian_src += files(
'shader_compiler_system_glslangValidator.cpp',
'shader_compiler_system_glslc.cpp'
)

if shaderc.found()
merian_src += files('shader_compiler_shaderc.cpp')
add_project_arguments('-DMERIAN_SHADERC_FOUND', language: 'cpp')
else
merian_src += files('shader_compiler_shaderc_stub.cpp')
endif

0 comments on commit 5eab4e5

Please sign in to comment.