summaryrefslogtreecommitdiffstats
path: root/packaging/windows/mingw-make.sh
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2012-10-16 04:04:37 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2012-10-16 04:08:33 -0700
commita9f3655d1af0c3af3276c4526e85e99cb50c4015 (patch)
tree3e3b26419e40e01f2eee8ef98495aaada05c780b /packaging/windows/mingw-make.sh
parent5bf6723d2617e80dac58d3b232e28ed594f02dba (diff)
downloadsubsurface-a9f3655d1af0c3af3276c4526e85e99cb50c4015.tar.gz
Improved packaging for Windows
This commit adds an install-cross-windows target to the Makefile that creates a staging directory for us under packaging/windows that contains the required .mo files. This currently fails for the Norwegian translation because of the no_NO.UTF-8 vs nb issue - right now we just use the first component of our own localization filename to find the matching Windows localization and that fails. The subsurface.nsi file is updated accordingly and this now appears to create working installers with sane paths for the localization files. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/windows/mingw-make.sh')
-rwxr-xr-xpackaging/windows/mingw-make.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh
index ec1f6ccc7..13a4cf5a9 100755
--- a/packaging/windows/mingw-make.sh
+++ b/packaging/windows/mingw-make.sh
@@ -9,6 +9,7 @@
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/ \
+ PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \
+ CROSS_LOCALE_PATH=/usr/i686-w64-mingw32/sys-root/mingw/share/ \
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
+ XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config NAME=subsurface.exe install-cross-windows