Add ARM and ARM64 for v141.
Sean Hall committed
Jan 13, 2019 at 19:01 UTC
89646a52694eee64a0486ce66e7a652173825f8f
5 files changed
+47
-10
appveyor.cmd
+2
@@ -8,6 +8,8 @@ msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140_xp
8
9
msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141_xp
10
msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v141_xp
11
+msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v141
12
+msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141
13
14
msbuild -p:Configuration=Release -t:PackNativeNuget src\wcautil\wcautil.vcxproj
15
src/Cpp.Build.props
+5
-1
@@ -8,6 +8,10 @@
8
<OutDir>$(OutputPath)$(Platform)\</OutDir>
9
</PropertyGroup>
10
11
+ <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'=='15.0'">
12
+ <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
13
+ </PropertyGroup>
14
+
15
<ItemDefinitionGroup>
16
<ClCompile>
17
<DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
@@ -16,7 +20,7 @@
20
<PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
21
<PrecompiledHeader>Use</PrecompiledHeader>
22
<PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
19
- <CallingConvention>StdCall</CallingConvention>
23
+ <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
24
<TreatWarningAsError>true</TreatWarningAsError>
25
<ExceptionHandling>false</ExceptionHandling>
26
<AdditionalOptions>-YlprecompDefine</AdditionalOptions>
src/wcautil/wcautil.nuspec
+2
@@ -23,5 +23,7 @@
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" />
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" />
28
</files>
29
</package>
src/wcautil/wcautil.vcxproj
+17
@@ -3,10 +3,26 @@
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')" />
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>
14
<ProjectConfiguration Include="Debug|Win32">
15
<Configuration>Debug</Configuration>
16
<Platform>Win32</Platform>
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>
26
<ProjectConfiguration Include="Release|Win32">
27
<Configuration>Release</Configuration>
28
<Platform>Win32</Platform>
@@ -26,6 +42,7 @@
42
<TargetName>wcautil</TargetName>
43
<MultiTargetLibrary>true</MultiTargetLibrary>
44
<PlatformToolset>v141_xp</PlatformToolset>
45
+ <PlatformToolset Condition="$(Platform.StartsWith('ARM'))">v141</PlatformToolset>
46
<CharacterSet>MultiByte</CharacterSet>
47
<Description>WiX Toolset Custom Action native utility library</Description>
48
</PropertyGroup>
wcautil.sln
+21
-9
@@ -3,24 +3,36 @@ Microsoft Visual Studio Solution File, Format Version 12.00
3
# Visual Studio 15
4
VisualStudioVersion = 15.0.26730.12
5
MinimumVisualStudioVersion = 15.0.26124.0
6
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wcautil", "src\wcautil\wcautil.vcxproj", "{1244E671-F108-4334-BA52-8A7517F26ECD}"
6
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wcautil", "src\wcautil\wcautil.vcxproj", "{5B3714B6-3A76-463E-8595-D48DA276C512}"
7
EndProject
8
Global
9
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10
+ Debug|ARM = Debug|ARM
11
+ Debug|ARM64 = Debug|ARM64
12
Debug|x64 = Debug|x64
13
Debug|x86 = Debug|x86
14
+ Release|ARM = Release|ARM
15
+ Release|ARM64 = Release|ARM64
16
Release|x64 = Release|x64
17
Release|x86 = Release|x86
18
EndGlobalSection
19
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16
- {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x64.ActiveCfg = Debug|x64
17
- {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x64.Build.0 = Debug|x64
18
- {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x86.ActiveCfg = Debug|Win32
19
- {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x86.Build.0 = Debug|Win32
20
- {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x64.ActiveCfg = Release|x64
21
- {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x64.Build.0 = Release|x64
22
- {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x86.ActiveCfg = Release|Win32
23
- {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x86.Build.0 = Release|Win32
20
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM.ActiveCfg = Debug|ARM
21
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM.Build.0 = Debug|ARM
22
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM64.ActiveCfg = Debug|ARM64
23
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM64.Build.0 = Debug|ARM64
24
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x64.ActiveCfg = Debug|x64
25
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x64.Build.0 = Debug|x64
26
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x86.ActiveCfg = Debug|Win32
27
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x86.Build.0 = Debug|Win32
28
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM.ActiveCfg = Release|ARM
29
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM.Build.0 = Release|ARM
30
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM64.ActiveCfg = Release|ARM64
31
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM64.Build.0 = Release|ARM64
32
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|x64.ActiveCfg = Release|x64
33
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|x64.Build.0 = Release|x64
34
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|x86.ActiveCfg = Release|Win32
35
+ {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|x86.Build.0 = Release|Win32
36
EndGlobalSection
37
GlobalSection(SolutionProperties) = preSolution
38
HideSolutionNode = FALSE