Skip to content

Commit

Permalink
Update the location of MSVC 2017 merge modules
Browse files Browse the repository at this point in the history 
See sqlitebrowser#1592.
  • Loading branch information
@karim
karim committed Nov 24, 2018
1 parent d206c9a commit 1ceb9ba
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions installer/windows/variables.wxi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,13 @@
Visual Studio 2013. The build "ARCH" will be set automatically.
-->

<?define VCRedistPath="C:\Program Files (x86)\Common Files\Merge Modules" ?>
<?define VCRedistFile="Microsoft_VC120_CRT_$(sys.BUILDARCH).msm" ?>
<?if $(sys.BUILDARCH)="x64"?>
<?define VCRedistPath="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\MergeModules" ?>
<?define VCRedistFile="Microsoft_VC141_CRT_$(sys.BUILDARCH).msm" ?>
<?elseif $(sys.BUILDARCH)="x86"?>
<?define VCRedistPath="C:\Program Files (x86)\Common Files\Merge Modules" ?>
<?define VCRedistFile="Microsoft_VC120_CRT_$(sys.BUILDARCH).msm" ?>
<?endif?>

<!--
=================================================== Build System ===================================================
Expand Down

0 comments on commit 1ceb9ba

Please sign in to comment.