diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-11-05 13:01:47 +0900 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-11-05 13:05:14 +0900 |
| commit | 9383693928b4393fd28bb52761c9cae4257e3829 (patch) | |
| tree | b953c4d0cf30e6849d8e439be9ccb1213a321999 /packaging | |
| parent | 7966f72fb78ef56a447ea6f33490dfec96c9d034 (diff) | |
| download | subsurface-9383693928b4393fd28bb52761c9cae4257e3829.tar.gz | |
Create installer with qmake
This is seriously flawed. makensis is run twice for some reason. I also
noticed that the data and xslt directories under packaging/windows aren't
created when running make install. Running
make -f Makefile.Release install_marbledir install_deploy
works, but obviously this should be taken care of by the dependency.
The installed binary under Windows is not finding its icon, the
translations are missing... lots of work left to do here.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/windows/subsurface.nsi.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in index 90981fdf6..50abde47e 100644 --- a/packaging/windows/subsurface.nsi.in +++ b/packaging/windows/subsurface.nsi.in @@ -98,8 +98,10 @@ Section Delete "$INSTDIR\*.dll" # Files to include in installer - File ..\..\subsurface.exe - File /r ..\..\xslt + File subsurface.exe + File /r xslt + File /r data + File /r images File dll\iconv.dll File dll\libdivecomputer-0.dll File dll\libintl-8.dll @@ -124,7 +126,6 @@ Section File dll\QtXml4.dll File dll\libmarblewidget.dll File subsurface.ico - File /r share # Store installation folder in registry WriteRegStr HKCU "Software\Subsurface" "" $INSTDIR |