Skip to content

Commit

Permalink
Fix VC redistributable paths after Visual Studio Update 3 changed the…
Browse files Browse the repository at this point in the history
… folder structure and versioning.

Bump configure.ac version.
  • Loading branch information
codereader committed Dec 17, 2017
1 parent d7b0285 commit 111501c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion configure.ac
@@ -1,4 +1,4 @@
AC_INIT([darkradiant], [2.4.0])
AC_INIT([darkradiant], [2.5.0])
AM_INIT_AUTOMAKE([subdir-objects])
AM_SILENT_RULES([yes])

Expand Down
4 changes: 2 additions & 2 deletions tools/scripts/compile_release_package.ps1
Expand Up @@ -47,14 +47,14 @@ if ($target -eq "x86")
$platform = "Win32"
$issFile = "..\innosetup\darkradiant.iss"
$portablePath = "DarkRadiant_install"
$redistSource = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Redist\MSVC\14.10.25008\x86\Microsoft.VC150.CRT"
$redistSource = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Redist\MSVC\14.11.25325\x86\Microsoft.VC141.CRT"
}
else
{
$platform = "x64"
$issFile = "..\innosetup\darkradiant.x64.iss"
$portablePath = "DarkRadiant_install.x64"
$redistSource = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Redist\MSVC\14.10.25008\x64\Microsoft.VC150.CRT"
$redistSource = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Redist\MSVC\14.11.25325\x64\Microsoft.VC141.CRT"
}

if (-not $skipbuild)
Expand Down

0 comments on commit 111501c

Please sign in to comment.