diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-11-15 15:02:45 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-11-15 15:02:45 -0800 |
| commit | 06bf0e1849559e0109c419beae627b44f477dc88 (patch) | |
| tree | 35b68161c8e51871ef0cd2423d9d981663ac7d09 | |
| parent | 0c833ef03bc77d637cfb0ffb989a4462a56aa06e (diff) | |
| download | subsurface-06bf0e1849559e0109c419beae627b44f477dc88.tar.gz | |
Include icons in the Windows installer
Also fix the dependency / ordering issue with running makensis
Fixes #252
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | packaging/windows/subsurface.nsi.in | 1 | ||||
| -rw-r--r-- | subsurface-install.pri | 8 | ||||
| -rw-r--r-- | subsurface.pro | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in index 50abde47e..67a40c5e9 100644 --- a/packaging/windows/subsurface.nsi.in +++ b/packaging/windows/subsurface.nsi.in @@ -102,6 +102,7 @@ Section File /r xslt File /r data File /r images + File /r icons File dll\iconv.dll File dll\libdivecomputer-0.dll File dll\libintl-8.dll diff --git a/subsurface-install.pri b/subsurface-install.pri index 83e718754..59690f256 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -1,5 +1,6 @@ marbledir.files = $$MARBLEDIR xslt.files = $$XSLT_FILES +icons.files = $$ICONS_FILES doc.files = $$DOC_FILES translation.files = $$replace(TRANSLATIONS, .ts, .qm) qttranslation.files = $$join(QTTRANSLATIONS," "$$[QT_INSTALL_TRANSLATIONS]/,$$[QT_INSTALL_TRANSLATIONS]/) @@ -46,7 +47,7 @@ mac { MAKENSIS = /usr/bin/makensis deploy.path = $$WINDOWSSTAGING - deploy.files += $$xslt.files $$doc.files + deploy.files += $$xslt.files $$doc.files $$icons.files deploy.CONFIG += no_check_exist target.path = $$WINDOWSSTAGING marbledir.path = $$WINDOWSSTAGING/data @@ -81,8 +82,9 @@ mac { nsis.target = $$NSISFILE installer.commands += $$MAKENSIS $$NSIFILE installer.target = installer - installer.depends = nsis - install.depends += dlls nsis installer + installer.depends = nsis install + QMAKE_EXTRA_TARGETS = installer nsis + install.depends += dlls } } else { # Linux install rules diff --git a/subsurface.pro b/subsurface.pro index 1b5f26b5e..23fc43af1 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -171,6 +171,7 @@ mac: ICON = packaging/macosx/Subsurface.icns else: ICON = subsurface-icon.svg MANPAGE = subsurface.1 XSLT_FILES = xslt +ICONS_FILES = icons DOC_FILES = $$OUT_PWD/Documentation/user-manual.html Documentation/images MARBLEDIR = marbledata/maps marbledata/bitmaps DEPLOYMENT_PLUGIN += imageformats/qjpeg |