RomanNum3ral
/
obs-streamFX
mirror of https://github.com/RomanNum3ral/obs-StreamFX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

templates: Fix installation path and 64-bit installations

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-09-29 05:39:20 +02:00
parent e95a20f658
commit 01b7d09196
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
templates/installer.iss.in
View File

@ -11,7 +11,7 @@
; Do not use the same AppId value in installers for other applications. ; Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
; app Information ; Application Information
AppId={{DE56A03A-C8A4-474B-83B0-CFD270262D38}} AppId={{DE56A03A-C8A4-474B-83B0-CFD270262D38}}
AppName={#MyAppName} AppName={#MyAppName}
AppVersion={#MyAppVersion} AppVersion={#MyAppVersion}
@ -20,13 +20,21 @@ AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL} AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL} AppUpdatesURL={#MyAppURL}
AppMutex={#MyAppName} AppMutex={#MyAppName}
; Versioning
VersionInfoVersion={#MyAppVersion} VersionInfoVersion={#MyAppVersion}
VersionInfoCompany={#MyAppPublisher} VersionInfoCompany={#MyAppPublisher}
VersionInfoDescription={#MyAppName} Setup VersionInfoDescription={#MyAppName} Setup
; Compression
Compression=lzma2/ultra64 ; Architecture (Platform is always Windows)
SolidCompression=yes ArchitecturesInstallIn64BitMode=@ARCH@
LZMAAlgorithm=1 ArchitecturesAllowed=@ARCH@
; Wizard Information
WizardStyle=modern
WizardResizable=yes
SetupIconFile="@PROJECT_SOURCE_DIR@/media/icon.ico"
; Other Information ; Other Information
DefaultDirName={code:GetDirName} DefaultDirName={code:GetDirName}
DefaultGroupName={#MyAppName} DefaultGroupName={#MyAppName}
@ -34,10 +42,9 @@ AllowNoIcons=yes
LicenseFile="@ISS_SOURCE_DIR@/LICENSE" LicenseFile="@ISS_SOURCE_DIR@/LICENSE"
OutputDir="@ISS_PACKAGE_DIR@" OutputDir="@ISS_PACKAGE_DIR@"
OutputBaseFilename=@CMAKE_PACKAGE_NAME@-@_PACKAGE_SUFFIX_OVERRIDE@ OutputBaseFilename=@CMAKE_PACKAGE_NAME@-@_PACKAGE_SUFFIX_OVERRIDE@
; Wizard Information Compression=lzma2/ultra64
WizardStyle=modern SolidCompression=yes
WizardResizable=yes LZMAAlgorithm=1
SetupIconFile="@PROJECT_SOURCE_DIR@/media/icon.ico"
[Languages] [Languages]
Name: "english"; MessagesFile: "compiler:Default.isl" Name: "english"; MessagesFile: "compiler:Default.isl"
@ -58,7 +65,7 @@ var
begin begin
// initialize default path, which will be returned when the following registry // initialize default path, which will be returned when the following registry
// key queries fail due to missing keys or for some different reason // key queries fail due to missing keys or for some different reason
Result := '{pf}\obs-studio'; Result := ExpandConstant('{pf}\obs-studio');
// query the first registry value; if this succeeds, return the obtained value // query the first registry value; if this succeeds, return the obtained value
if RegQueryStringValue(HKLM32, 'SOFTWARE\OBS Studio', '', InstallPath) then if RegQueryStringValue(HKLM32, 'SOFTWARE\OBS Studio', '', InstallPath) then
Result := InstallPath Result := InstallPath
@ -77,14 +84,12 @@ begin
Result := sUnInstallString; Result := sUnInstallString;
end; end;
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
function IsUpgrade(): Boolean; function IsUpgrade(): Boolean;
begin begin
Result := (GetUninstallString() <> ''); Result := (GetUninstallString() <> '');
end; end;
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
function UnInstallOldVersion(): Integer; function UnInstallOldVersion(): Integer;
var var