From 26ef59dd6f3740f53dd4fdbae76144d0e0c96604 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Mon, 5 Feb 2018 11:58:49 +0100
Subject: [PATCH] [d3d11] dlls_setup.sh -> setup_dxvk.sh

Also, the install script no longer relies on the prefix
being set by the Meson configuration.
---
 wine_utils/meson.build                        |  4 +--
 .../{dlls_setup.sh.in => setup_dxvk.sh.in}    | 28 ++++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)
 rename wine_utils/{dlls_setup.sh.in => setup_dxvk.sh.in} (77%)

diff --git a/wine_utils/meson.build b/wine_utils/meson.build
index 466cef13f..484641637 100644
--- a/wine_utils/meson.build
+++ b/wine_utils/meson.build
@@ -3,7 +3,7 @@ conf.set('dlldir', get_option('prefix')+'/'+get_option('bindir'))
 conf.set('arch', target_machine.cpu_family())
 configure_file(
   configuration : conf,
-  input         : 'dlls_setup.sh.in',
-  output        : 'dlls_setup.sh',
+  input         : 'setup_dxvk.sh.in',
+  output        : 'setup_dxvk.sh',
   install_dir   : get_option('bindir')
 )
diff --git a/wine_utils/dlls_setup.sh.in b/wine_utils/setup_dxvk.sh.in
similarity index 77%
rename from wine_utils/dlls_setup.sh.in
rename to wine_utils/setup_dxvk.sh.in
index 018325f6a..a3a1ba9af 100644
--- a/wine_utils/dlls_setup.sh.in
+++ b/wine_utils/setup_dxvk.sh.in
@@ -1,9 +1,15 @@
 #!/bin/bash
 
-dlls_dir='@dlldir@'
-build_arch='@arch@'
 export WINEDEBUG=-all
 
+dlls_dir=`dirname $(readlink -f $0)`
+build_arch='@arch@'
+
+if [ ! -f "$dlls_dir/d3d11.dll" ] || [ ! -f "$dlls_dir/dxgi.dll" ]; then
+    echo "d3d11.dll or dxgi.dll not found in $dlls_dir"
+    exit 1
+fi
+
 if [ $build_arch == "x86_64" ]; then
     wine=wine64
 else
@@ -54,11 +60,13 @@ if [ "$1" == "reset" ]; then
     removeOverride d3d11
     echo -n '[2/2] '
     removeOverride dxgi
-    exit
-fi
-
-echo -n '[1/2] '
-createOverride d3d11
-echo -n '[2/2] '
-createOverride dxgi
-exit
+elif [ -z "$1" ]; then
+    echo -n '[1/2] '
+    createOverride d3d11
+    echo -n '[2/2] '
+    createOverride dxgi
+else
+    echo "Unrecognized option: $1"
+    echo "Usage: $0 [reset]"
+    exit 1
+fi
\ No newline at end of file