Always configure vulkan json

pull/58/head
jackun 4 years ago
parent deaccb7dd8
commit fa41e6f882
No known key found for this signature in database
GPG Key ID: 119DB3F1D05A9ED3

@ -171,6 +171,8 @@ uninstall() {
rm -rfv "/usr/share/doc/mangohud" 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.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"
rm -fv "/usr/bin/mangohud.x86" rm -fv "/usr/bin/mangohud.x86"
} }

@ -94,25 +94,14 @@ vklayer_mesa_overlay = shared_library(
install : true install : true
) )
if get_option('append_libdir_mangohud') configure_file(input : 'mangohud.json.in',
configure_file(input : 'mangohud.json.in', output : '@0@.@1@.json'.format(meson.project_name(), target_machine.cpu_family()),
output : '@0@.@1@.json'.format(meson.project_name(), target_machine.cpu_family()), configuration : {'libdir_mangohud' : libdir_mangohud + '/',
configuration : {'libdir_mangohud' : libdir_mangohud + '/', 'PROJECT_NAME' : meson.project_name() + ' ',
'PROJECT_NAME' : meson.project_name() + ' ', 'LAYER_SUFFIX' : target_machine.cpu_family()},
'LAYER_SUFFIX' : target_machine.cpu_family()}, install : true,
install : true, install_dir : join_paths(get_option('datadir'), 'vulkan', 'implicit_layer.d'),
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
if target_machine.cpu_family() == 'x86_64' if target_machine.cpu_family() == 'x86_64'
mangohud_cpu_family = '' mangohud_cpu_family = ''

Loading…
Cancel
Save