diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-18 21:39:57 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-18 21:42:42 +1000 |
| commit | 57536725e6061c7f6cd0f532c07beca7cd1228c9 (patch) | |
| tree | d17ded6ed34a69e9be22359531b653427bd99f2f | |
| parent | b73f7f24be617227f14240fa9ba9e12fa386913d (diff) | |
| download | wix-57536725e6061c7f6cd0f532c07beca7cd1228c9.tar.gz wix-57536725e6061c7f6cd0f532c07beca7cd1228c9.tar.bz2 wix-57536725e6061c7f6cd0f532c07beca7cd1228c9.zip | |
Pack v141 ARM and ARM64.
| -rw-r--r-- | src/dutil/dutil.nuspec | 2 | ||||
| -rw-r--r-- | src/dutil/dutil.vcxproj | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/dutil/dutil.nuspec b/src/dutil/dutil.nuspec index 2ae420e1..45ac64f0 100644 --- a/src/dutil/dutil.nuspec +++ b/src/dutil/dutil.nuspec | |||
| @@ -19,10 +19,8 @@ | |||
| 19 | <file src="..\..\build\$configuration$\v140\x86\dutil.lib" target="build\native\v140\x86" /> | 19 | <file src="..\..\build\$configuration$\v140\x86\dutil.lib" target="build\native\v140\x86" /> |
| 20 | <file src="..\..\build\$configuration$\v141\x64\dutil.lib" target="build\native\v141\x64" /> | 20 | <file src="..\..\build\$configuration$\v141\x64\dutil.lib" target="build\native\v141\x64" /> |
| 21 | <file src="..\..\build\$configuration$\v141\x86\dutil.lib" target="build\native\v141\x86" /> | 21 | <file src="..\..\build\$configuration$\v141\x86\dutil.lib" target="build\native\v141\x86" /> |
| 22 | <!-- | ||
| 23 | <file src="..\..\build\$configuration$\v141\ARM\dutil.lib" target="build\native\v141\ARM" /> | 22 | <file src="..\..\build\$configuration$\v141\ARM\dutil.lib" target="build\native\v141\ARM" /> |
| 24 | <file src="..\..\build\$configuration$\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" /> | 23 | <file src="..\..\build\$configuration$\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" /> |
| 25 | --> | ||
| 26 | <file src="..\..\build\$configuration$\v142\x64\dutil.lib" target="build\native\v142\x64" /> | 24 | <file src="..\..\build\$configuration$\v142\x64\dutil.lib" target="build\native\v142\x64" /> |
| 27 | <file src="..\..\build\$configuration$\v142\x86\dutil.lib" target="build\native\v142\x86" /> | 25 | <file src="..\..\build\$configuration$\v142\x86\dutil.lib" target="build\native\v142\x86" /> |
| 28 | <file src="..\..\build\$configuration$\v142\ARM\dutil.lib" target="build\native\v142\ARM" /> | 26 | <file src="..\..\build\$configuration$\v142\ARM\dutil.lib" target="build\native\v142\ARM" /> |
diff --git a/src/dutil/dutil.vcxproj b/src/dutil/dutil.vcxproj index f44b195c..d6374f19 100644 --- a/src/dutil/dutil.vcxproj +++ b/src/dutil/dutil.vcxproj | |||
| @@ -42,8 +42,7 @@ | |||
| 42 | <ConfigurationType>StaticLibrary</ConfigurationType> | 42 | <ConfigurationType>StaticLibrary</ConfigurationType> |
| 43 | <TargetName>dutil</TargetName> | 43 | <TargetName>dutil</TargetName> |
| 44 | <MultiTargetLibrary>true</MultiTargetLibrary> | 44 | <MultiTargetLibrary>true</MultiTargetLibrary> |
| 45 | <PlatformToolset>v141_xp</PlatformToolset> | 45 | <PlatformToolset>v142</PlatformToolset> |
| 46 | <PlatformToolset Condition="$(Platform.StartsWith('ARM'))">v141</PlatformToolset> | ||
| 47 | <CharacterSet>MultiByte</CharacterSet> | 46 | <CharacterSet>MultiByte</CharacterSet> |
| 48 | <Description>WiX Toolset native library foundation</Description> | 47 | <Description>WiX Toolset native library foundation</Description> |
| 49 | </PropertyGroup> | 48 | </PropertyGroup> |