diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-24 14:32:26 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-24 20:36:35 +1000 |
| commit | 84a60ab50339f158715172ef24804c5b9cb5ba9d (patch) | |
| tree | f2052847f2a19c193ff7a92864ae0467e48dc464 /src/wixnative | |
| parent | c1cc095efa7deec07ffe29034a076035458c260f (diff) | |
| download | wix-84a60ab50339f158715172ef24804c5b9cb5ba9d.tar.gz wix-84a60ab50339f158715172ef24804c5b9cb5ba9d.tar.bz2 wix-84a60ab50339f158715172ef24804c5b9cb5ba9d.zip | |
Add ARM/ARM64 wixnative.exe
Update mergemod.dll from SDK 10.0.19041.0.
Diffstat (limited to 'src/wixnative')
| -rw-r--r-- | src/wixnative/ARM/mergemod.dll | bin | 0 -> 172704 bytes | |||
| -rw-r--r-- | src/wixnative/ARM64/mergemod.dll | bin | 0 -> 194512 bytes | |||
| -rw-r--r-- | src/wixnative/Win32/mergemod.dll | bin | 169304 -> 159176 bytes | |||
| -rw-r--r-- | src/wixnative/wixnative.vcxproj | 26 | ||||
| -rw-r--r-- | src/wixnative/x64/mergemod.dll | bin | 183848 -> 180376 bytes |
5 files changed, 21 insertions, 5 deletions
diff --git a/src/wixnative/ARM/mergemod.dll b/src/wixnative/ARM/mergemod.dll new file mode 100644 index 00000000..739af831 --- /dev/null +++ b/src/wixnative/ARM/mergemod.dll | |||
| Binary files differ | |||
diff --git a/src/wixnative/ARM64/mergemod.dll b/src/wixnative/ARM64/mergemod.dll new file mode 100644 index 00000000..564a75fc --- /dev/null +++ b/src/wixnative/ARM64/mergemod.dll | |||
| Binary files differ | |||
diff --git a/src/wixnative/Win32/mergemod.dll b/src/wixnative/Win32/mergemod.dll index 2bf647b2..4286df4d 100644 --- a/src/wixnative/Win32/mergemod.dll +++ b/src/wixnative/Win32/mergemod.dll | |||
| Binary files differ | |||
diff --git a/src/wixnative/wixnative.vcxproj b/src/wixnative/wixnative.vcxproj index e53af651..373c8d06 100644 --- a/src/wixnative/wixnative.vcxproj +++ b/src/wixnative/wixnative.vcxproj | |||
| @@ -5,18 +5,34 @@ | |||
| 5 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> | 5 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> |
| 6 | 6 | ||
| 7 | <ItemGroup Label="ProjectConfigurations"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
| 8 | <ProjectConfiguration Include="Debug|Win32"> | 8 | <ProjectConfiguration Include="Debug|ARM"> |
| 9 | <Configuration>Debug</Configuration> | 9 | <Configuration>Debug</Configuration> |
| 10 | <Platform>Win32</Platform> | 10 | <Platform>ARM</Platform> |
| 11 | </ProjectConfiguration> | 11 | </ProjectConfiguration> |
| 12 | <ProjectConfiguration Include="Release|Win32"> | 12 | <ProjectConfiguration Include="Debug|ARM64"> |
| 13 | <Configuration>Release</Configuration> | 13 | <Configuration>Debug</Configuration> |
| 14 | <Platform>ARM64</Platform> | ||
| 15 | </ProjectConfiguration> | ||
| 16 | <ProjectConfiguration Include="Debug|Win32"> | ||
| 17 | <Configuration>Debug</Configuration> | ||
| 14 | <Platform>Win32</Platform> | 18 | <Platform>Win32</Platform> |
| 15 | </ProjectConfiguration> | 19 | </ProjectConfiguration> |
| 16 | <ProjectConfiguration Include="Debug|x64"> | 20 | <ProjectConfiguration Include="Debug|x64"> |
| 17 | <Configuration>Debug</Configuration> | 21 | <Configuration>Debug</Configuration> |
| 18 | <Platform>x64</Platform> | 22 | <Platform>x64</Platform> |
| 19 | </ProjectConfiguration> | 23 | </ProjectConfiguration> |
| 24 | <ProjectConfiguration Include="Release|ARM"> | ||
| 25 | <Configuration>Release</Configuration> | ||
| 26 | <Platform>ARM</Platform> | ||
| 27 | </ProjectConfiguration> | ||
| 28 | <ProjectConfiguration Include="Release|ARM64"> | ||
| 29 | <Configuration>Release</Configuration> | ||
| 30 | <Platform>ARM64</Platform> | ||
| 31 | </ProjectConfiguration> | ||
| 32 | <ProjectConfiguration Include="Release|Win32"> | ||
| 33 | <Configuration>Release</Configuration> | ||
| 34 | <Platform>Win32</Platform> | ||
| 35 | </ProjectConfiguration> | ||
| 20 | <ProjectConfiguration Include="Release|x64"> | 36 | <ProjectConfiguration Include="Release|x64"> |
| 21 | <Configuration>Release</Configuration> | 37 | <Configuration>Release</Configuration> |
| 22 | <Platform>x64</Platform> | 38 | <Platform>x64</Platform> |
| @@ -28,7 +44,7 @@ | |||
| 28 | <ConfigurationType>Application</ConfigurationType> | 44 | <ConfigurationType>Application</ConfigurationType> |
| 29 | <ProjectSubSystem>Console</ProjectSubSystem> | 45 | <ProjectSubSystem>Console</ProjectSubSystem> |
| 30 | <TargetName>wixnative</TargetName> | 46 | <TargetName>wixnative</TargetName> |
| 31 | <PlatformToolset>v141</PlatformToolset> | 47 | <PlatformToolset>v142</PlatformToolset> |
| 32 | <CharacterSet>Unicode</CharacterSet> | 48 | <CharacterSet>Unicode</CharacterSet> |
| 33 | </PropertyGroup> | 49 | </PropertyGroup> |
| 34 | 50 | ||
diff --git a/src/wixnative/x64/mergemod.dll b/src/wixnative/x64/mergemod.dll index 2f4cdc7c..b6422174 100644 --- a/src/wixnative/x64/mergemod.dll +++ b/src/wixnative/x64/mergemod.dll | |||
| Binary files differ | |||