From fa41e6f882d19eed5d80e3ba8e4012cabc184a80 Mon Sep 17 00:00:00 2001 From: jackun Date: Sat, 14 Mar 2020 13:22:17 +0200 Subject: [PATCH] Always configure vulkan json --- build.sh | 2 ++ src/meson.build | 27 ++++++++------------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/build.sh b/build.sh index 2d8d5208..411a09a5 100755 --- a/build.sh +++ b/build.sh @@ -171,6 +171,8 @@ uninstall() { rm -rfv "/usr/share/doc/mangohud" rm -fv "/usr/share/vulkan/implicit_layer.d/mangohud.json" rm -fv "/usr/share/vulkan/implicit_layer.d/MangoHud.json" + rm -fv "/usr/share/vulkan/implicit_layer.d/MangoHud.x86.json" + rm -fv "/usr/share/vulkan/implicit_layer.d/MangoHud.x86_64.json" rm -fv "/usr/bin/mangohud" rm -fv "/usr/bin/mangohud.x86" } diff --git a/src/meson.build b/src/meson.build index 55524c02..3c187d62 100644 --- a/src/meson.build +++ b/src/meson.build @@ -94,25 +94,14 @@ vklayer_mesa_overlay = shared_library( install : true ) -if get_option('append_libdir_mangohud') - configure_file(input : 'mangohud.json.in', - output : '@0@.@1@.json'.format(meson.project_name(), target_machine.cpu_family()), - configuration : {'libdir_mangohud' : libdir_mangohud + '/', - 'PROJECT_NAME' : meson.project_name() + ' ', - 'LAYER_SUFFIX' : target_machine.cpu_family()}, - install : true, - install_dir : join_paths(get_option('datadir'), 'vulkan', 'implicit_layer.d'), - ) -else - configure_file(input : 'mangohud.json.in', - output : '@0@.json'.format(meson.project_name()), - configuration : {'PROJECT_NAME' : meson.project_name(), - 'libdir_mangohud' : '', - 'LAYER_SUFFIX' : ''}, - install : true, - install_dir : join_paths(get_option('datadir'), 'vulkan', 'implicit_layer.d'), - ) -endif +configure_file(input : 'mangohud.json.in', + output : '@0@.@1@.json'.format(meson.project_name(), target_machine.cpu_family()), + configuration : {'libdir_mangohud' : libdir_mangohud + '/', + 'PROJECT_NAME' : meson.project_name() + ' ', + 'LAYER_SUFFIX' : target_machine.cpu_family()}, + install : true, + install_dir : join_paths(get_option('datadir'), 'vulkan', 'implicit_layer.d'), +) if target_machine.cpu_family() == 'x86_64' mangohud_cpu_family = ''