From 0aa7ab8fdbd7c38ebac55f374c35aec86e096ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Cereto-Massagu=C3=A9?= Date: Sun, 22 Jul 2018 15:33:39 +0200 Subject: [PATCH] add winelib build support to the setup script --- wine_utils/meson.build | 1 + wine_utils/setup_dxvk.sh.in | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/wine_utils/meson.build b/wine_utils/meson.build index 48464163..6967fabb 100644 --- a/wine_utils/meson.build +++ b/wine_utils/meson.build @@ -1,6 +1,7 @@ conf = configuration_data() conf.set('dlldir', get_option('prefix')+'/'+get_option('bindir')) conf.set('arch', target_machine.cpu_family()) +conf.set('winelib', meson.get_cross_property('winelib', false)) configure_file( configuration : conf, input : 'setup_dxvk.sh.in', diff --git a/wine_utils/setup_dxvk.sh.in b/wine_utils/setup_dxvk.sh.in index a153965f..266d0122 100755 --- a/wine_utils/setup_dxvk.sh.in +++ b/wine_utils/setup_dxvk.sh.in @@ -4,9 +4,17 @@ export WINEDEBUG=-all dlls_dir=`dirname "$(readlink -f $0)"` build_arch='@arch@' +winelib='@winelib@' -if [ ! -f "$dlls_dir/d3d11.dll" ] || [ ! -f "$dlls_dir/dxgi.dll" ]; then - echo "d3d11.dll or dxgi.dll not found in $dlls_dir" >&2 +if [ $winelib == 'True' ]; then + 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 fi @@ -128,8 +136,8 @@ function checkOverride { echo -e '\e[1;31mnot set\e[0m.' ret=2 fi - echo -n " [2/2] Checking link to $1.dll... " - if [ "$(readlink -f "$unix_sys_path/$1.dll")" == "$(readlink -f "$dlls_dir/$1.dll")" ]; then + echo -n " [2/2] Checking link to $1.$dll_ext... " + if [ "$(readlink -f "$unix_sys_path/$1.dll")" == "$(readlink -f "$dlls_dir/$1.$dll_ext")" ]; then echo -e '\e[1;32mOK\e[0m.' else echo -e '\e[1;31mnot set\e[0m.' @@ -146,8 +154,8 @@ function createOverride { exit 1 fi echo -e "$(sed -e 's|\r||g' <<< "\\e[1;32m$out\\e[0m.")" - echo -n " [2/2] Creating link to $1.dll... " - ln -sf "$dlls_dir/$1.dll" "$unix_sys_path/$1.dll" + echo -n " [2/2] Creating link to $1.$dll_ext... " + ln -sf "$dlls_dir/$1.$dll_ext" "$unix_sys_path/$1.dll" if [ $? -eq 0 ]; then echo -e '\e[1;32mDone\e[0m.' else