From 89646a52694eee64a0486ce66e7a652173825f8f Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 13 Jan 2019 19:01:16 -0600
Subject: Add ARM and ARM64 for v141.

---
 src/Cpp.Build.props         |  6 +++++-
 src/wcautil/wcautil.nuspec  |  2 ++
 src/wcautil/wcautil.vcxproj | 17 +++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 296b36ca..0e00132b 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -8,6 +8,10 @@
     <OutDir>$(OutputPath)$(Platform)\</OutDir>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'=='15.0'">
+    <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+
   <ItemDefinitionGroup>
     <ClCompile>
       <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
@@ -16,7 +20,7 @@
       <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
-      <CallingConvention>StdCall</CallingConvention>
+      <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
       <TreatWarningAsError>true</TreatWarningAsError>
       <ExceptionHandling>false</ExceptionHandling>
       <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
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 @@
     <file src="..\..\build\$configuration$\v140_xp\x86\wcautil.lib" target="build\native\v140\x86" />
     <file src="..\..\build\$configuration$\v141_xp\x64\wcautil.lib" target="build\native\v141\x64" />
     <file src="..\..\build\$configuration$\v141_xp\x86\wcautil.lib" target="build\native\v141\x86" />
+    <file src="..\..\build\$configuration$\v141\ARM\wcautil.lib" target="build\native\v141\ARM" />
+    <file src="..\..\build\$configuration$\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" />
   </files>
 </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 @@
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props')" />
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -26,6 +42,7 @@
     <TargetName>wcautil</TargetName>
     <MultiTargetLibrary>true</MultiTargetLibrary>
     <PlatformToolset>v141_xp</PlatformToolset>
+    <PlatformToolset Condition="$(Platform.StartsWith('ARM'))">v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <Description>WiX Toolset Custom Action native utility library</Description>
   </PropertyGroup>
-- 
cgit v1.2.3-55-g6feb