summaryrefslogtreecommitdiffstats
path: root/packaging/windows
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-11-27 12:07:49 -0800
committerGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-11-27 12:07:49 -0800
commitee68ada729837162e29d879ca408836d0d66c7ac (patch)
tree44f7512f045850a0206c82c100a5d1a24601cb3c /packaging/windows
parent19356de24620c75c26152c5f19947c8a1e5215cb (diff)
parentff0209a5b42ced7d8b9ef9c5d84cbc5a4d84a0ac (diff)
downloadsubsurface-ee68ada729837162e29d879ca408836d0d66c7ac.tar.gz
Merge branch 'windows-fixes' of git://git.hohndel.org/subsurface
* 'windows-fixes' of git://git.hohndel.org/subsurface: fix mingw-win32 specific warnings in libdivecomputer.c Fix mingw-make.sh to find correct xslt-config
Diffstat (limited to 'packaging/windows')
-rwxr-xr-xpackaging/windows/mingw-make.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh
index 79e7ad5ea..ec1f6ccc7 100755
--- a/packaging/windows/mingw-make.sh
+++ b/packaging/windows/mingw-make.sh
@@ -6,7 +6,9 @@
# the paths work for the default mingw32 install on OpenSUSE - adjust as
# necessary
+export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH
make CC=i686-w64-mingw32-gcc \
PKGCONFIG=i686-w64-mingw32-pkg-config \
PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/i686-w64-mingw32/lib/pkgconfig/ \
+ XSLTCONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xslt-config \
XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config NAME=subsurface.exe