diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-18 21:46:27 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-18 21:48:44 +1000 |
| commit | 0f13c5ea646abd77db71f1c7b562b9f9abdaa236 (patch) | |
| tree | ceb39431ee029c559495673e0875ed9a4cee454a | |
| parent | e39bb78e89148ef1635085c58cc348c1291d4439 (diff) | |
| download | wix-0f13c5ea646abd77db71f1c7b562b9f9abdaa236.tar.gz wix-0f13c5ea646abd77db71f1c7b562b9f9abdaa236.tar.bz2 wix-0f13c5ea646abd77db71f1c7b562b9f9abdaa236.zip | |
Pack v141 ARM and ARM64.
| -rw-r--r-- | src/wcautil/wcautil.nuspec | 2 | ||||
| -rw-r--r-- | src/wcautil/wcautil.vcxproj | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/wcautil/wcautil.nuspec b/src/wcautil/wcautil.nuspec index 784aa2bb..b2786a00 100644 --- a/src/wcautil/wcautil.nuspec +++ b/src/wcautil/wcautil.nuspec | |||
| @@ -22,10 +22,8 @@ | |||
| 22 | <file src="..\..\build\$configuration$\v140\x86\wcautil.lib" target="build\native\v140\x86" /> | 22 | <file src="..\..\build\$configuration$\v140\x86\wcautil.lib" target="build\native\v140\x86" /> |
| 23 | <file src="..\..\build\$configuration$\v141\x64\wcautil.lib" target="build\native\v141\x64" /> | 23 | <file src="..\..\build\$configuration$\v141\x64\wcautil.lib" target="build\native\v141\x64" /> |
| 24 | <file src="..\..\build\$configuration$\v141\x86\wcautil.lib" target="build\native\v141\x86" /> | 24 | <file src="..\..\build\$configuration$\v141\x86\wcautil.lib" target="build\native\v141\x86" /> |
| 25 | <!-- | ||
| 26 | <file src="..\..\build\$configuration$\v141\ARM\wcautil.lib" target="build\native\v141\ARM" /> | 25 | <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 | <file src="..\..\build\$configuration$\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" /> |
| 28 | --> | ||
| 29 | <file src="..\..\build\$configuration$\v142\x64\wcautil.lib" target="build\native\v142\x64" /> | 27 | <file src="..\..\build\$configuration$\v142\x64\wcautil.lib" target="build\native\v142\x64" /> |
| 30 | <file src="..\..\build\$configuration$\v142\x86\wcautil.lib" target="build\native\v142\x86" /> | 28 | <file src="..\..\build\$configuration$\v142\x86\wcautil.lib" target="build\native\v142\x86" /> |
| 31 | <file src="..\..\build\$configuration$\v142\ARM\wcautil.lib" target="build\native\v142\ARM" /> | 29 | <file src="..\..\build\$configuration$\v142\ARM\wcautil.lib" target="build\native\v142\ARM" /> |
diff --git a/src/wcautil/wcautil.vcxproj b/src/wcautil/wcautil.vcxproj index 2d027540..9d1dd28a 100644 --- a/src/wcautil/wcautil.vcxproj +++ b/src/wcautil/wcautil.vcxproj | |||
| @@ -41,8 +41,7 @@ | |||
| 41 | <ConfigurationType>StaticLibrary</ConfigurationType> | 41 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 42 | <TargetName>wcautil</TargetName> | 42 | <TargetName>wcautil</TargetName> |
| 43 | <MultiTargetLibrary>true</MultiTargetLibrary> | 43 | <MultiTargetLibrary>true</MultiTargetLibrary> |
| 44 | <PlatformToolset>v141_xp</PlatformToolset> | 44 | <PlatformToolset>v142</PlatformToolset> |
| 45 | <PlatformToolset Condition="$(Platform.StartsWith('ARM'))">v141</PlatformToolset> | ||
| 46 | <CharacterSet>MultiByte</CharacterSet> | 45 | <CharacterSet>MultiByte</CharacterSet> |
| 47 | <Description>WiX Toolset Custom Action native utility library</Description> | 46 | <Description>WiX Toolset Custom Action native utility library</Description> |
| 48 | </PropertyGroup> | 47 | </PropertyGroup> |