diff --git a/meson_options.txt b/meson_options.txt index 58239fa1..1147f32b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,7 +4,6 @@ option('use_system_spdlog', type : 'feature', value : 'disabled', description: ' option('vulkan_datadir', type : 'string', value : '', description: 'Path to the system vulkan headers data directory if different from MangoHud\'s datadir') option('append_libdir_mangohud', type : 'boolean', value : true, description: 'Append "mangohud" to libdir path or not.') option('ld_libdir_abs', type : 'boolean', value : false, description: 'Use absolute path in LD_PRELOAD') -option('prepend_libdir_vk', type : 'boolean', value : true, description: 'Prepend libdir to library path in vulkan manifest') option('include_doc', type : 'boolean', value : true, description: 'Include the example config, man pages, appstream files etc.') option('with_nvml', type : 'combo', value : 'enabled', choices: ['enabled', 'system', 'disabled'], description: 'Enable NVML support') option('with_xnvctrl', type : 'feature', value : 'enabled', description: 'Enable XNVCtrl support') diff --git a/pkgbuild/PKGBUILD b/pkgbuild/PKGBUILD index c68dcf5b..d9bc0208 100644 --- a/pkgbuild/PKGBUILD +++ b/pkgbuild/PKGBUILD @@ -25,7 +25,7 @@ sha256sums=('SKIP' '3c38f275d5792b1286391102594329e98b17737924b344f98312ab09929b74be' 'b94997df68856753b72f0d7a3703b7d484d4745c567f3584ef97c96c25a5798e') -_build_args="-Dappend_libdir_mangohud=false -Dwith_xnvctrl=disabled -Duse_system_vulkan=enabled -Dmangoapp_layer=true -Dprepend_libdir_vk=false" +_build_args="-Dappend_libdir_mangohud=false -Dwith_xnvctrl=disabled -Duse_system_vulkan=enabled -Dmangoapp_layer=true" pkgver() { cd "$srcdir/mangohud" diff --git a/src/meson.build b/src/meson.build index 7c0d6835..8fae2a85 100644 --- a/src/meson.build +++ b/src/meson.build @@ -19,11 +19,6 @@ else conf_data.set('ld_libdir_mangohud', ld_libdir_mangohud) endif -ld_libdir_mangohud_vk = '' -if get_option('prepend_libdir_vk') - ld_libdir_mangohud_vk = ld_libdir_mangohud -endif - overlay_shaders = [ 'overlay.frag', 'overlay.vert', @@ -289,7 +284,7 @@ endif configure_file(input : 'mangohud.json.in', output : '@0@.@1@.json'.format(meson.project_name(), host_machine.cpu_family()), - configuration : {'ld_libdir_mangohud' : ld_libdir_mangohud_vk.replace('\$', '$')}, + configuration : {'ld_libdir_mangohud' : ld_libdir_mangohud.replace('\$', '$')}, install : true, install_dir : join_paths(get_option('datadir'), 'vulkan', 'implicit_layer.d'), install_tag : 'runtime', @@ -305,7 +300,7 @@ configure_file(input : '../bin/mangohud.in', if get_option('mangoapp_layer') configure_file(input : 'app/layer.json.in', output : 'libMangoApp.@0@.json'.format(host_machine.cpu_family()), - configuration : {'ld_libdir_mangohud' : ld_libdir_mangohud_vk.replace('\$', '$')}, + configuration : {'ld_libdir_mangohud' : ld_libdir_mangohud.replace('\$', '$')}, install : true, install_dir : join_paths(get_option('datadir'), 'vulkan', 'implicit_layer.d'), install_tag : 'mangoapp',