aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Thiago Macieira <thiago@macieira.org>2013-11-27 17:54:29 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-11-27 17:55:05 -0800
commit4b4e59a7e8a051c39d64fa3410f19ad0f94c2535 (patch)
treee8beab1c14dfba9a7ea21eb0645aec5fa73fb9a1
parent9befbe410922e964d8c0eb35ee75b4b64cb6c96a (diff)
downloadsubsurface-4b4e59a7e8a051c39d64fa3410f19ad0f94c2535.tar.gz
Use wildcards in the NSIS installer rules for Qt DLLs
That way, the NSIS rules also work for creating an installer for debug builds. Which you'd do by running: make -f Makefile.Debug installer Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--packaging/windows/subsurface.nsi.in14
1 files changed, 3 insertions, 11 deletions
diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in
index c4a58094f..73ed2ce49 100644
--- a/packaging/windows/subsurface.nsi.in
+++ b/packaging/windows/subsurface.nsi.in
@@ -106,6 +106,7 @@ Section
File iconv.dll
File libdivecomputer-0.dll
File libpng15-15.dll
+ File libjpeg-*.dll
File libusb-1.0.dll
File libxml2-2.dll
File libxslt-1.dll
@@ -114,17 +115,8 @@ Section
File libsqlite3-0.dll
File libgcc_s_sjlj-1.dll
File libstdc++-6.dll
- File QtCore4.dll
- File QtGui4.dll
- File QtNetwork4.dll
- File QtSvg4.dll
- File QtWebKit4.dll
- File QtDeclarative4.dll
- File QtScript4.dll
- File QtSql4.dll
- File QtXmlPatterns4.dll
- File QtXml4.dll
- File libmarblewidget.dll
+ File libmarblewidget*dll
+ File Qt*4.dll
File subsurface.ico
# Store installation folder in registry