rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-14 22:29:15 +01:00
Code Issues Projects Releases Wiki Activity

add winelib build support to the setup script

Browse Source
This commit is contained in:
Adrià Cereto-Massagué 2018-07-22 15:33:39 +02:00 committed by Philip Rebohle
parent 656cb2e4aa
commit 0aa7ab8fdb
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wine_utils/meson.build
View File

@ -1,6 +1,7 @@
conf = configuration_data() conf = configuration_data()
conf.set('dlldir', get_option('prefix')+'/'+get_option('bindir')) conf.set('dlldir', get_option('prefix')+'/'+get_option('bindir'))
conf.set('arch', target_machine.cpu_family()) conf.set('arch', target_machine.cpu_family())
conf.set('winelib', meson.get_cross_property('winelib', false))
configure_file( configure_file(
configuration : conf, configuration : conf,
input : 'setup_dxvk.sh.in', input : 'setup_dxvk.sh.in',

20
wine_utils/setup_dxvk.sh.in
View File

@ -4,9 +4,17 @@ export WINEDEBUG=-all
dlls_dir=`dirname "$(readlink -f $0)"` dlls_dir=`dirname "$(readlink -f $0)"`
build_arch='@arch@' build_arch='@arch@'
winelib='@winelib@'
if [ ! -f "$dlls_dir/d3d11.dll" ] || [ ! -f "$dlls_dir/dxgi.dll" ]; then if [ $winelib == 'True' ]; then
echo "d3d11.dll or dxgi.dll not found in $dlls_dir" >&2 dll_ext='dll.so'
dlls_dir="$dlls_dir"/../lib
else
dll_ext='dll'
fi
if [ ! -f "$dlls_dir/d3d11.$dll_ext" ] || [ ! -f "$dlls_dir/dxgi.$dll_ext" ]; then
echo "d3d11.$dll_ext or dxgi.$dll_ext not found in $dlls_dir" >&2
exit 1 exit 1
fi fi
@ -128,8 +136,8 @@ function checkOverride {
echo -e '\e[1;31mnot set\e[0m.' echo -e '\e[1;31mnot set\e[0m.'
ret=2 ret=2
fi fi
echo -n " [2/2] Checking link to $1.dll... " echo -n " [2/2] Checking link to $1.$dll_ext... "
if [ "$(readlink -f "$unix_sys_path/$1.dll")" == "$(readlink -f "$dlls_dir/$1.dll")" ]; then if [ "$(readlink -f "$unix_sys_path/$1.dll")" == "$(readlink -f "$dlls_dir/$1.$dll_ext")" ]; then
echo -e '\e[1;32mOK\e[0m.' echo -e '\e[1;32mOK\e[0m.'
else else
echo -e '\e[1;31mnot set\e[0m.' echo -e '\e[1;31mnot set\e[0m.'
@ -146,8 +154,8 @@ function createOverride {
exit 1 exit 1
fi fi
echo -e "$(sed -e 's|\r||g' <<< "\\e[1;32m$out\\e[0m.")" echo -e "$(sed -e 's|\r||g' <<< "\\e[1;32m$out\\e[0m.")"
echo -n " [2/2] Creating link to $1.dll... " echo -n " [2/2] Creating link to $1.$dll_ext... "
ln -sf "$dlls_dir/$1.dll" "$unix_sys_path/$1.dll" ln -sf "$dlls_dir/$1.$dll_ext" "$unix_sys_path/$1.dll"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo -e '\e[1;32mDone\e[0m.' echo -e '\e[1;32mDone\e[0m.'
else else