diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2019-01-13 19:01:16 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2019-01-13 19:01:16 -0600 |
| commit | 89646a52694eee64a0486ce66e7a652173825f8f (patch) | |
| tree | 4e9e5d5a3167858bd7572f8a985e68757c5713c0 /src/wcautil | |
| parent | 0480be68d919d232caa081570257674902879382 (diff) | |
| download | wix-89646a52694eee64a0486ce66e7a652173825f8f.tar.gz wix-89646a52694eee64a0486ce66e7a652173825f8f.tar.bz2 wix-89646a52694eee64a0486ce66e7a652173825f8f.zip | |
Add ARM and ARM64 for v141.
Diffstat (limited to 'src/wcautil')
| -rw-r--r-- | src/wcautil/wcautil.nuspec | 2 | ||||
| -rw-r--r-- | src/wcautil/wcautil.vcxproj | 17 |
2 files changed, 19 insertions, 0 deletions
diff --git a/src/wcautil/wcautil.nuspec b/src/wcautil/wcautil.nuspec index 66baa81b..7a4707d1 100644 --- a/src/wcautil/wcautil.nuspec +++ b/src/wcautil/wcautil.nuspec | |||
| @@ -23,5 +23,7 @@ | |||
| 23 | <file src="..\..\build\$configuration$\v140_xp\x86\wcautil.lib" target="build\native\v140\x86" /> | 23 | <file src="..\..\build\$configuration$\v140_xp\x86\wcautil.lib" target="build\native\v140\x86" /> |
| 24 | <file src="..\..\build\$configuration$\v141_xp\x64\wcautil.lib" target="build\native\v141\x64" /> | 24 | <file src="..\..\build\$configuration$\v141_xp\x64\wcautil.lib" target="build\native\v141\x64" /> |
| 25 | <file src="..\..\build\$configuration$\v141_xp\x86\wcautil.lib" target="build\native\v141\x86" /> | 25 | <file src="..\..\build\$configuration$\v141_xp\x86\wcautil.lib" target="build\native\v141\x86" /> |
| 26 | <file src="..\..\build\$configuration$\v141\ARM\wcautil.lib" target="build\native\v141\ARM" /> | ||
| 27 | <file src="..\..\build\$configuration$\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" /> | ||
| 26 | </files> | 28 | </files> |
| 27 | </package> | 29 | </package> |
diff --git a/src/wcautil/wcautil.vcxproj b/src/wcautil/wcautil.vcxproj index d9356a8e..5cdbf6f1 100644 --- a/src/wcautil/wcautil.vcxproj +++ b/src/wcautil/wcautil.vcxproj | |||
| @@ -3,10 +3,26 @@ | |||
| 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props')" /> |
| 5 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 6 | <ProjectConfiguration Include="Debug|ARM"> | ||
| 7 | <Configuration>Debug</Configuration> | ||
| 8 | <Platform>ARM</Platform> | ||
| 9 | </ProjectConfiguration> | ||
| 10 | <ProjectConfiguration Include="Debug|ARM64"> | ||
| 11 | <Configuration>Debug</Configuration> | ||
| 12 | <Platform>ARM64</Platform> | ||
| 13 | </ProjectConfiguration> | ||
| 6 | <ProjectConfiguration Include="Debug|Win32"> | 14 | <ProjectConfiguration Include="Debug|Win32"> |
| 7 | <Configuration>Debug</Configuration> | 15 | <Configuration>Debug</Configuration> |
| 8 | <Platform>Win32</Platform> | 16 | <Platform>Win32</Platform> |
| 9 | </ProjectConfiguration> | 17 | </ProjectConfiguration> |
| 18 | <ProjectConfiguration Include="Release|ARM"> | ||
| 19 | <Configuration>Release</Configuration> | ||
| 20 | <Platform>ARM</Platform> | ||
| 21 | </ProjectConfiguration> | ||
| 22 | <ProjectConfiguration Include="Release|ARM64"> | ||
| 23 | <Configuration>Release</Configuration> | ||
| 24 | <Platform>ARM64</Platform> | ||
| 25 | </ProjectConfiguration> | ||
| 10 | <ProjectConfiguration Include="Release|Win32"> | 26 | <ProjectConfiguration Include="Release|Win32"> |
| 11 | <Configuration>Release</Configuration> | 27 | <Configuration>Release</Configuration> |
| 12 | <Platform>Win32</Platform> | 28 | <Platform>Win32</Platform> |
| @@ -26,6 +42,7 @@ | |||
| 26 | <TargetName>wcautil</TargetName> | 42 | <TargetName>wcautil</TargetName> |
| 27 | <MultiTargetLibrary>true</MultiTargetLibrary> | 43 | <MultiTargetLibrary>true</MultiTargetLibrary> |
| 28 | <PlatformToolset>v141_xp</PlatformToolset> | 44 | <PlatformToolset>v141_xp</PlatformToolset> |
| 45 | <PlatformToolset Condition="$(Platform.StartsWith('ARM'))">v141</PlatformToolset> | ||
| 29 | <CharacterSet>MultiByte</CharacterSet> | 46 | <CharacterSet>MultiByte</CharacterSet> |
| 30 | <Description>WiX Toolset Custom Action native utility library</Description> | 47 | <Description>WiX Toolset Custom Action native utility library</Description> |
| 31 | </PropertyGroup> | 48 | </PropertyGroup> |