diff --git a/.github/workflows/create-installer.yml b/.github/workflows/create-installer.yml index 84b043e..e4c1632 100644 --- a/.github/workflows/create-installer.yml +++ b/.github/workflows/create-installer.yml @@ -39,6 +39,12 @@ jobs: tag: ${{github.event.inputs.tag_value}} fileName: 'pcsx2-v*-windows-x64-Qt.7z' + - name: Grab latest Visual C++ Redistributable Version + shell: cmd + run: | + cd res + aria2c -Z "https://aka.ms/vs/17/release/vc_redist.x64.exe" + - name: Extract the Release shell: cmd run: | diff --git a/PCSX2 Installer.iss b/PCSX2 Installer.iss index e8c4823..4f0b2f6 100644 --- a/PCSX2 Installer.iss +++ b/PCSX2 Installer.iss @@ -24,10 +24,11 @@ AppPublisher={#MyAppPublisher} AppPublisherURL={#MyAppURL} AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} -Compression=lzma/max +Compression=lzma2/max SolidCompression=yes ArchitecturesInstallIn64BitMode=win64 -MinVersion=10.0.17134 +WizardStyle=modern +MinVersion=10.0.17763 ;10.0.22000 ; Windows 11 code just for testing failure on Windows 10 DefaultGroupName={#MyAppName} @@ -54,7 +55,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: checkedonce [Files] -Source: "{#MySetupResourceDir}\Redist\VC_redist.x64.exe"; DestDir: {tmp} +Source: "{#MySetupResourceDir}\VC_redist.x64.exe"; DestDir: {tmp} Source: "{#MyAppSourceDir}\*"; Excludes: "PUT PCSX2 BUILD HERE.txt"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "{#MySetupResourceDir}\portable.txt"; DestDir: {app} ; Check: IsPortableInstallation; ; NOTE: Don't use "Flags: ignoreversion" on any shared system files @@ -76,7 +77,7 @@ var FullDescLabel: TLabel; PartDescLabel: TLabel; begin - CustomPage := CreateCustomPage(wpWelcome, 'Installation type', ''); + CustomPage := CreateCustomPage(wpWelcome, 'Installation type', 'Determine PCSX2's installation behavior'); StandardRadioButton := TNewRadioButton.Create(WizardForm); StandardRadioButton.Parent := CustomPage.Surface; StandardRadioButton.Checked := True; @@ -112,8 +113,6 @@ begin PartDescLabel.Caption := PortableDescText; end; -{TODO: Need to find a way to determine how to dynamically adjust "WizardForm.DirEdit.Text := ''" at runtime, how to if else on pascal?;} - function isPortableInstallation: Boolean; begin Result := PortableRadioButton.Checked; diff --git a/README.md b/README.md index 11de064..74a97a8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # How to setup -0. You will need Inno Setup, you can download it from their website -1. Put a PCSX2 build into the main folder -2. Put a `VC_redist.x64.exe` file into the Redist folder -3. Use the Inno Setup Compiler to open, edit and compile the .iss file \ No newline at end of file +0. You will need Inno Setup, you can download it from [their website](https://jrsoftware.org/isdl.php). +1. Put a PCSX2 build into the `main` folder. +2. Put the VC++ Redist (`VC_redist.x64.exe`) file into the `res` folder. +3. Use the Inno Setup Compiler to open, edit and compile the `.iss` file. diff --git a/res/AppIconLarge.bmp b/res/AppIconLarge.bmp index 381346a..18f41f3 100644 Binary files a/res/AppIconLarge.bmp and b/res/AppIconLarge.bmp differ diff --git a/res/AppIconLarge.ico b/res/AppIconLarge.ico index 68d9100..036be17 100644 Binary files a/res/AppIconLarge.ico and b/res/AppIconLarge.ico differ diff --git a/res/Redist/VC_redist.x64.exe b/res/Redist/VC_redist.x64.exe deleted file mode 100644 index 9ea4955..0000000 Binary files a/res/Redist/VC_redist.x64.exe and /dev/null differ