Commit 6fd0b782 authored by Dennis Nienhüser's avatar Dennis Nienhüser

Move win/mac installation files to common dir. Split iss files.

Inno setup files are now three files: One for each 32 bit and 64 bit,
and a generic one included by the other two. This avoids having
to toggle 32 vs 64 bit settings each time.

(cherry picked from commit 2ae0a956)
(cherry picked from commit 71ec5575)
parent 32fd8ce2
; Change this to your Qt installation directory. Make sure to choose
; the correct compiler and architecture
#define MyQtDir "C:\Qt\5.5\msvc2013"
; Change this to where you installed Marble to (CMAKE_INSTALL_PREFIX)
#define MyBuildDir "C:\marble\export-32bit"
#define MyArch "x86"
; Open this file and adjust the version number on top
#include "marble-common.iss"
; Change this to your Qt installation directory. Make sure to choose
; the correct compiler and architecture
#define MyQtDir "C:\Qt\5.5\msvc2013_64"
; Change this to where you installed Marble to (CMAKE_INSTALL_PREFIX)
#define MyBuildDir "C:\marble\export-64bit"
#define MyArch "x64"
; Open this file and adjust the version number on top
#include "marble-common.iss"
#define MyAppName "Marble"
#define MyAppVersion "1.14.1"
#define MySrcDir SourcePath + "\..\..\"
#define MyAppName "Marble"
#define MyAppPublisher "KDE"
#define MyAppURL "https://marble.kde.org/"
#define MyAppExeName "marble-qt.exe"
#define MyArch "x64"
#define MyQtDir "C:\Qt\5.5\msvc2013_64"
#define MySrcDir "C:\marble\src"
#define MyBuildDir "C:\marble\export-64bit"
[Setup]
; NOTE: The value of AppId uniquely identifies this application.
......@@ -35,7 +33,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files]
Source: "marble.kde.org.url"; DestDir: "{app}"
Source: "{#MySrcDir}\marble.kde.org.url"; DestDir: "{app}"
Source: "{#MyBuildDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "{#MyQtDir}\bin\icudt54.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#MyQtDir}\bin\icuin54.dll"; DestDir: "{app}"; Flags: ignoreversion
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment