rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-11 10:24:10 +01:00
Code Issues Projects Releases Wiki Activity

[meta] Don't hardcode the default libdir

Browse Source 
Use the configured libdir, so non-defaults paths don't break the script.
This commit is contained in:
Andre Heider 2018-10-05 12:20:31 +02:00 committed by Philip Rebohle
parent e5f3019524
commit 7d7dbe2632
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
utils/meson.build
View File

@ -1,5 +1,6 @@
conf = configuration_data() conf = configuration_data()
conf.set('dlldir', get_option('prefix')+'/'+get_option('bindir')) conf.set('bindir', get_option('bindir'))
conf.set('libdir', get_option('libdir'))
conf.set('arch', target_machine.cpu_family()) conf.set('arch', target_machine.cpu_family())
conf.set('winelib', meson.get_cross_property('winelib', false)) conf.set('winelib', meson.get_cross_property('winelib', false))
configure_file( configure_file(

3
utils/setup_dxvk.sh.in
View File

@ -8,7 +8,8 @@ winelib='@winelib@'
if [ $winelib == 'True' ]; then if [ $winelib == 'True' ]; then
dll_ext='dll.so' dll_ext='dll.so'
dlls_dir="$dlls_dir"/../lib # strip off the trailing bindir to get to the prefix, then append libdir
dlls_dir="${dlls_dir%/@bindir@}/@libdir@"
else else
dll_ext='dll' dll_ext='dll'
fi fi