summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/windows/mingw-make.sh2
-rw-r--r--packaging/windows/subsurface.nsi.in17
2 files changed, 18 insertions, 1 deletions
diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh
index 53599ed20..8bb891752 100755
--- a/packaging/windows/mingw-make.sh
+++ b/packaging/windows/mingw-make.sh
@@ -16,4 +16,4 @@ make CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ \
PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \
CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw/ \
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 install-cross-windows $@
+ XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config install-cross-windows $@
diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in
index 60263843c..34566dd7c 100644
--- a/packaging/windows/subsurface.nsi.in
+++ b/packaging/windows/subsurface.nsi.in
@@ -137,6 +137,13 @@ Section
File dll\libbz2-1.dll
File dll\libsoup-2.4-1.dll
File dll\libosmgpsmap-2.dll
+ File dll\libsqlite3-0.dll
+ File dll\libgnutls-26.dll
+ File dll\libgnutls-extra-26.dll
+ File dll\libgnutls-openssl-27.dll
+ File dll\libgnutlsxx-27.dll
+ File dll\libp11-kit-0.dll
+ File mydll\libgiognutls.dll
File subsurface.ico
File /r share
@@ -154,6 +161,15 @@ Section
# Create the uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Subsurface" \
+ "DisplayName" "Subsurface"
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Subsurface" \
+ "DisplayIcon" "$INSTDIR\subsurface.ico"
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Subsurface" \
+ "UninstallString" "$INSTDIR\Uninstall.exe"
+ WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Subsurface" \
+ "DisplayVersion" ${SUBSURFACE_VERSION}
+
SectionEnd
#--------------------------------
@@ -182,5 +198,6 @@ Section "Uninstall"
# Remove registry entries
DeleteRegKey /ifempty HKCU "Software\Subsurface"
+ DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Subsurface"
SectionEnd