diff --git a/meson.build b/meson.build index 077b488..aef33a5 100644 --- a/meson.build +++ b/meson.build @@ -7,6 +7,9 @@ dst = meson.current_source_dir() + '/import/' run_command( 'python3', meson.source_root() + '/subprojects/evol/buildscripts/copy.py', src, dst) subdir('import') +cc = meson.get_compiler('c') +cc_id = cc.get_id() + subproject('evmod_ecs') mod_src = [ @@ -25,13 +28,18 @@ mod_incdir = [ mod_deps = [ evmod_deps, - dependency('shaderc'), dependency('threads'), dependency('assetsys'), dependency('evmod_ecs'), ] +if cc_id == 'msvc' + mod_deps += dependency('shaderc_msvc') +else + mod_deps += dependency('shaderc_clang') +endif + module = shared_module( 'evmodassetmanager', mod_src, include_directories: mod_incdir, diff --git a/subprojects/packagefiles/libshaderc/meson.build b/subprojects/packagefiles/libshaderc/meson.build index d158d5a..d5bbdbb 100644 --- a/subprojects/packagefiles/libshaderc/meson.build +++ b/subprojects/packagefiles/libshaderc/meson.build @@ -10,4 +10,5 @@ shaderc_dep = declare_dependency( include_directories: shaderc_inc, ) -meson.override_dependency('shaderc', shaderc_dep) +meson.override_dependency('shaderc_msvc', shaderc_dep) +meson.override_dependency('shaderc_clang', shaderc_dep) diff --git a/subprojects/shaderc.wrap b/subprojects/shaderc_clang.wrap similarity index 81% rename from subprojects/shaderc.wrap rename to subprojects/shaderc_clang.wrap index ca9a081..5c20d09 100644 --- a/subprojects/shaderc.wrap +++ b/subprojects/shaderc_clang.wrap @@ -2,11 +2,11 @@ directory = libshaderc source_url = https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/linux/continuous_clang_release/364/20210607-072233/install.tgz -source_filename = libshaderc-upstream.tgz +source_filename = libshaderc-upstream-clang.tgz source_hash = f46dd35f6904af2b3330201ffb0f2f1ef5f8b8ede44491fad1a37b4a791772ef lead_directory_missing = libshaderc patch_directory = libshaderc [provide] -dependency_names = shaderc +dependency_names = shaderc_clang diff --git a/subprojects/shaderc_msvc.wrap b/subprojects/shaderc_msvc.wrap new file mode 100644 index 0000000..32a9368 --- /dev/null +++ b/subprojects/shaderc_msvc.wrap @@ -0,0 +1,12 @@ +[wrap-file] +directory = libshaderc + +source_url = https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/windows/continuous_release_2017/368/20210607-072143/install.zip +source_filename = libshaderc-upstream-msvc.zip +source_hash = 5256f02a11dceb3390edaabd452a23ee48c4fe7b43bca754de87738adea96255 +lead_directory_missing = libshaderc + +patch_directory = libshaderc + +[provide] +dependency_names = shaderc_msvc