Skip to content

Commit

Permalink
Adjust innosetup files to include the newer VC++ redistributables
Browse files Browse the repository at this point in the history
  • Loading branch information
codereader committed Dec 8, 2019
1 parent 5f7ddcc commit 46ecf33
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions tools/innosetup/darkradiant.iss
Expand Up @@ -3,15 +3,15 @@

[Setup]
AppName=DarkRadiant
AppVerName=DarkRadiant 2.6.1pre1 x86
AppVerName=DarkRadiant 2.7.0pre1 x86
AppPublisher=The Dark Mod
AppPublisherURL=http://www.darkradiant.net
AppSupportURL=http://www.darkradiant.net
AppUpdatesURL=http://www.darkradiant.net
AppPublisherURL=https://www.darkradiant.net
AppSupportURL=https://www.darkradiant.net
AppUpdatesURL=https://www.darkradiant.net
DefaultDirName={pf}\DarkRadiant
DefaultGroupName=DarkRadiant 2.6.1pre1 x86
DefaultGroupName=DarkRadiant 2.7.0pre1 x86
OutputDir=.
OutputBaseFilename=darkradiant-2.6.1pre1-x86
OutputBaseFilename=darkradiant-2.7.0pre1-x86
Compression=lzma
SolidCompression=yes
;ArchitecturesAllowed=x64
Expand All @@ -26,8 +26,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
[Files]
Source: "..\..\install\darkradiant.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\install\*"; Excludes: "*.pdb,*.exp,*.lib,*.in,*.fbp,*.iobj,*.ipdb"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Redist\MSVC\14.12.25810\x86\Microsoft.VC141.CRT\msvcp140.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Redist\MSVC\14.12.25810\x86\Microsoft.VC141.CRT\vcruntime140.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.23.27820\x86\Microsoft.VC142.CRT\msvcp140.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.23.27820\x86\Microsoft.VC142.CRT\vcruntime140.dll"; DestDir: "{app}"; Flags: ignoreversion

; NOTE: Don't use "Flags: ignoreversion" on any shared system files

Expand Down
16 changes: 8 additions & 8 deletions tools/innosetup/darkradiant.x64.iss
Expand Up @@ -3,15 +3,15 @@

[Setup]
AppName=DarkRadiant
AppVerName=DarkRadiant 2.6.1pre1 x64
AppVerName=DarkRadiant 2.7.0pre1 x64
AppPublisher=The Dark Mod
AppPublisherURL=http://www.darkradiant.net
AppSupportURL=http://www.darkradiant.net
AppUpdatesURL=http://www.darkradiant.net
AppPublisherURL=https://www.darkradiant.net
AppSupportURL=https://www.darkradiant.net
AppUpdatesURL=https://www.darkradiant.net
DefaultDirName={pf}\DarkRadiant
DefaultGroupName=DarkRadiant 2.6.1pre1 x64
DefaultGroupName=DarkRadiant 2.7.0pre1 x64
OutputDir=.
OutputBaseFilename=darkradiant-2.6.1pre1-x64
OutputBaseFilename=darkradiant-2.7.0pre1-x64
Compression=lzma
SolidCompression=yes
ArchitecturesAllowed=x64
Expand All @@ -26,8 +26,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
[Files]
Source: "..\..\install\darkradiant.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\install\*"; Excludes: "*.pdb,*.exp,*.lib,*.in,*.fbp,*.iobj,*.ipdb"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Redist\MSVC\14.12.25810\x64\Microsoft.VC141.CRT\msvcp140.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Redist\MSVC\14.12.25810\x64\Microsoft.VC141.CRT\vcruntime140.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.23.27820\x64\Microsoft.VC142.CRT\msvcp140.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.23.27820\x64\Microsoft.VC142.CRT\vcruntime140.dll"; DestDir: "{app}"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files

[Icons]
Expand Down

0 comments on commit 46ecf33

Please sign in to comment.