diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-04-21 11:09:07 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-04-21 12:16:56 -0700 |
| commit | d4617803691c3193fb0a898fa39b0688379e17cd (patch) | |
| tree | 2b34460093aa58dfe30c026406b52e26c1d16189 /packaging | |
| parent | 986309b108aa66f6f4561f95e9b012ae739251ea (diff) | |
| download | subsurface-d4617803691c3193fb0a898fa39b0688379e17cd.tar.gz | |
Windows out of tree cross build: stage package in correct folder
When doing an out of tree build you don't want to stage the package with
the source but under your current directory. So let's make sure we
distinguish between source and target here... and instead of putting
things into packaging/windows they now end up in staging which is much
more consistent. And to make my life even easier, the installer .exe ends
up in the base dir in which you build the package.
Also, we link statically against libdivecomputer, so don't pack the dll.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/windows/subsurface.nsi.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in index 1a718a2bf..24b502ff9 100644 --- a/packaging/windows/subsurface.nsi.in +++ b/packaging/windows/subsurface.nsi.in @@ -26,7 +26,7 @@ # Installer name and filename Name "Subsurface" Caption "Subsurface ${SUBSURFACE_VERSION} Setup" - OutFile "subsurface-${SUBSURFACE_VERSION}.exe" + OutFile "..\subsurface-${SUBSURFACE_VERSION}.exe" # Icon to use for the installer !define MUI_ICON "subsurface.ico" @@ -70,7 +70,7 @@ # Pages # Installer pages - !insertmacro MUI_PAGE_LICENSE "..\..\gpl-2.0.txt" + !insertmacro MUI_PAGE_LICENSE "gpl-2.0.txt" !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder !insertmacro MUI_PAGE_INSTFILES @@ -105,7 +105,6 @@ Section File /r Documentation File /r translations File iconv.dll - File libdivecomputer-0.dll File libpng16-16.dll File libjpeg-*.dll File libusb-1.0.dll |