summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/windows/mingw-make.sh5
-rw-r--r--packaging/windows/subsurface.nsi2
2 files changed, 3 insertions, 4 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
diff --git a/packaging/windows/subsurface.nsi b/packaging/windows/subsurface.nsi
index b19c9a49b..31eaa30ef 100644
--- a/packaging/windows/subsurface.nsi
+++ b/packaging/windows/subsurface.nsi
@@ -136,7 +136,6 @@ Section
File dll\pthreadGC2.dll
File dll\zlib1.dll
File subsurface.ico
- File /r ..\..\locale
File /r share
# Store installation folder in registry
@@ -169,7 +168,6 @@ Section "Uninstall"
Delete "$INSTDIR\subsurface.svg"
Delete "$INSTDIR\Uninstall.exe"
RMDir /r "$INSTDIR\share"
- RMDir /r "$INSTDIR\locale"
RMDir "$INSTDIR"
# Remove shortcuts