summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--mingw-wine.sh7
2 files changed, 3 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d0720a91d257..430f8158d317 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Fri Feb 23 15:26:49 UTC 2018
+# Fri Feb 23 15:30:30 UTC 2018
pkgbase = mingw-w64-cmake
pkgdesc = CMake wrapper for MinGW (mingw-w64)
pkgver = 1
diff --git a/mingw-wine.sh b/mingw-wine.sh
index 31ec78ecbcc6..d3cebe1b9dff 100644
--- a/mingw-wine.sh
+++ b/mingw-wine.sh
@@ -6,10 +6,7 @@ mingw_prefix=/usr/@TRIPLE@
# 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 -z "${WINEPREFIX}"
-then
- export WINEPREFIX=~/.wine-@TRIPLE@
-fi
+export WINEPREFIX=~/.wine-@TRIPLE@
# WINEPATH is used to find dlls, otherwise they should lie next to the exe
if test -z "${WINEPATH}"
@@ -17,6 +14,7 @@ then
export WINEPATH=${mingw_prefix}/bin
fi
+
if test "@TRIPLE@" = "x86_64-w64-mingw32"
then
export WINEARCH=win64
@@ -24,6 +22,5 @@ else
export WINEARCH=win32
fi
-
wine "$@"