WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-12-14 03:59:36 +00:00
Code Issues Projects Releases Wiki Activity

Update installer to VS2019 C++ runtime.

Browse Source
This commit is contained in:
elasota
2021-11-10 17:22:01 -05:00
parent d698ff23db
commit 7c5864d59b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReleasePackageInstaller/Product.wxs
View File

@@ -146,10 +146,10 @@
<WixVariable Id="WixUIBannerBmp" Value="$(var.ProjectDir)\TopBanner.bmp"/> <WixVariable Id="WixUIBannerBmp" Value="$(var.ProjectDir)\TopBanner.bmp"/>
<DirectoryRef Id="TARGETDIR"> <DirectoryRef Id="TARGETDIR">
<Merge Id="VCRedist" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_x64.msm" DiskId="1" Language="0" /> <Merge Id="VCRedist" SourceFile="$(var.VSInstallDir)\VC\Redist\MSVC\v142\MergeModules\Microsoft_VC142_CRT_x64.msm" DiskId="1" Language="0" />
</DirectoryRef> </DirectoryRef>
<Feature Id="VCRedist" Title="Microsoft Visual C++ 2017 Runtime" AllowAdvertise="no" Display="hidden" Level="1"> <Feature Id="VCRedist" Title="Microsoft Visual C++ 2019 Runtime" AllowAdvertise="no" Display="hidden" Level="1">
<MergeRef Id="VCRedist" /> <MergeRef Id="VCRedist" />
</Feature> </Feature>

5
ReleasePackageInstaller/ReleasePackageInstaller.wixproj
View File

@@ -19,6 +19,10 @@
<OutputPath>$(SolutionDir)ReleasePkg\</OutputPath> <OutputPath>$(SolutionDir)ReleasePkg\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<Cultures>en-us</Cultures> <Cultures>en-us</Cultures>
<DefineConstants>DocumentationDataDir=$(SolutionDir)\Documentation;
HousesDataDir=$(SolutionDir)\Packaged\Houses;
PackagedDataDir=$(SolutionDir)\Packaged;
VSInstallDir=$(VsInstallRoot)</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Product.wxs" /> <Compile Include="Product.wxs" />
@@ -179,6 +183,7 @@
DocumentationDataDir=$(SolutionDir)\Documentation; DocumentationDataDir=$(SolutionDir)\Documentation;
HousesDataDir=$(SolutionDir)\Packaged\Houses; HousesDataDir=$(SolutionDir)\Packaged\Houses;
PackagedDataDir=$(SolutionDir)\Packaged; PackagedDataDir=$(SolutionDir)\Packaged;
VSInstallDir=$(VsInstallRoot)
</DefineConstants> </DefineConstants>
</PropertyGroup> </PropertyGroup>
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">