From 74f647c9fe5315b341ef838a51a2a2c06f102fca Mon Sep 17 00:00:00 2001 From: WombatFromHell Date: Sun, 16 Jun 2019 18:04:37 -0600 Subject: [PATCH] More readable notes and ISS tweaks --- GloSC.sln | 5 +++++ GloSC_install_script.iss | 15 +++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/GloSC.sln b/GloSC.sln index 0439451..78a2879 100644 --- a/GloSC.sln +++ b/GloSC.sln @@ -11,6 +11,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EnforceBindingDLL", "Enforc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GloSC_Watchdog", "GloSC_Watchdog\GloSC_Watchdog.vcxproj", "{752D3933-73A3-45E4-B139-CCB8C04BE543}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A03AE2A7-1DCF-4EE2-BC45-4A1D973EE621}" + ProjectSection(SolutionItems) = preProject + GloSC_install_script.iss = GloSC_install_script.iss + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 diff --git a/GloSC_install_script.iss b/GloSC_install_script.iss index 91cb622..a936461 100644 --- a/GloSC_install_script.iss +++ b/GloSC_install_script.iss @@ -29,8 +29,6 @@ OutputBaseFilename=GloSC-installer PrivilegesRequired=admin Compression=lzma SolidCompression=yes -; allow checking architecture mode for driver install -ArchitecturesInstallIn64BitMode=x64 [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" @@ -60,10 +58,11 @@ Source: "redist\libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "redist\ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "redist\OpenSSL License.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "dependencies\minhook\MH_LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion -; vigembus driver package -Source: "redist\ViGEmBus-LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion +; +; NOTE: ViGEmBus installer and KB3033929 MSU's have to be downloaded separately and placed in the source redist directory +; Source: "redist\ViGEmBus_Setup.exe"; DestDir: "{app}\redist"; Flags: ignoreversion solidbreak -; patch files for vigembus driver pre-reqs +Source: "redist\ViGEmBus-LICENSE.txt"; DestDir: "{app}\redist"; Flags: ignoreversion Source: "redist\Windows6.1-KB3033929-x64.msu"; DestDir: "{app}\redist"; Flags: ignoreversion solidbreak Source: "redist\Windows6.1-KB3033929-x86.msu"; DestDir: "{app}\redist"; Flags: ignoreversion @@ -77,9 +76,9 @@ Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: Filename: "{app}\redist\vc_redist_x86.exe"; Parameters: "/quiet /install"; Description: "Installing Redist. packages"; Flags: runascurrentuser ; vigembus driver install Filename: "{app}\redist\ViGEmBus_Setup.exe"; Description: "Install ViGEmBus Driver"; Flags: nowait postinstall skipifsilent -; vigembus driver pre-reqs (win7 patches) -Filename: wusa.exe; Parameters: """{app}\redist\Windows6.1-KB3033929-x64.msu"" /quiet"; Description: "Install ViGEmBus Win7 Pre-reqs (Hotfix x64)"; Check: Is64bitInstallMode -Filename: wusa.exe; Parameters: """{app}\redist\Windows6.1-KB3033929-x86.msu"" /quiet"; Description: "Install ViGEmBus Win7 Pre-reqs (Hotfix x86)"; Check: not Is64bitInstallMode +; vigembus driver pre-reqs (win7 patches) - safe to run silently and let them fail if they're not necessary for this OS version +Filename: wusa.exe; Parameters: """{app}\redist\Windows6.1-KB3033929-x64.msu"" /quiet"; Description: "Install ViGEmBus Win7 Pre-reqs (Hotfix x64)" +Filename: wusa.exe; Parameters: """{app}\redist\Windows6.1-KB3033929-x86.msu"" /quiet"; Description: "Install ViGEmBus Win7 Pre-reqs (Hotfix x86)" ; install glosc after prereqs Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: runascurrentuser nowait postinstall skipifsilent