summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Zou2016-04-03 09:34:08 +0200
committerMichel Zou2016-04-03 09:34:08 +0200
commit9c816ed4e890350a7e8a3cdbbeaa5ded4d73081d (patch)
tree089cdbccebcd14034592e7cde06584ff3c6a012e
parentd296029483383adea120174ae3329b1e841cf21b (diff)
downloadaur-9c816ed4e890350a7e8a3cdbbeaa5ded4d73081d.tar.gz
use WINEPATH
-rw-r--r--.SRCINFO2
-rw-r--r--mingw-wine.sh23
2 files changed, 11 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dde77494f8ee..cc304556fae0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Fri Apr 1 17:59:50 UTC 2016
+# Sun Apr 3 07:34:08 UTC 2016
pkgbase = mingw-w64-cmake
pkgdesc = CMake wrapper for MinGW (mingw-w64)
pkgver = 1
diff --git a/mingw-wine.sh b/mingw-wine.sh
index 292e2f49aa31..0f347f89e712 100644
--- a/mingw-wine.sh
+++ b/mingw-wine.sh
@@ -4,21 +4,18 @@ set -e
mingw_prefix=/usr/@TRIPLE@
-# wine requires the dlls to lie next to the exe
-if test -f "$1"
-then
- path=`dirname $1`
- if ! test -f "${path}/libstdc++-6.dll"
- then
- cp ${mingw_prefix}/bin/*.dll ${path}
- fi
-fi
-
# run it in a custom WINEPREFIX to not mess with default ~/.wine
# also default prefix might be a 32 bits prefix, which will fail to run x86_64 exes
if ! test -d "${WINEPREFIX}"
then
- WINEPREFIX=~/.wine-@TRIPLE@ wine "$@"
-else
- wine "$@"
+ export WINEPREFIX=~/.wine-@TRIPLE@
+fi
+
+# WINEPATH is used to find dlls, otherwise they should lie next to the exe
+if test -z "${WINEPATH}"
+then
+ export WINEPATH=${mingw_prefix}/bin
fi
+
+wine "$@"
+