t1ha-windows: disable build dll/exe for ARM/ARM64.

erthink · Feb 8, 2018 · ab1c494 · ab1c494
1 parent 55bef95
commit ab1c494
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -21,6 +21,14 @@ platform:
 - x86
 - x64
 - ARM
+- ARM64
+
+matrix:
+  exclude:
+    - platform: ARM64
+      TOOLSET: v140
+    - platform: ARM64
+      TOOLSET: v120
 
 build_script:
 - ps: >

diff --git a/t1ha-dll.vcxproj b/t1ha-dll.vcxproj
@@ -62,11 +62,13 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
+    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -79,12 +81,14 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

diff --git a/t1ha-static.vcxproj b/t1ha-static.vcxproj
@@ -59,11 +59,13 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
+    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -74,11 +76,13 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
+    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

diff --git a/t1ha-test.vcxproj b/t1ha-test.vcxproj
@@ -60,11 +60,13 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
+    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -77,12 +79,14 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

diff --git a/t1ha.sln b/t1ha.sln
@@ -21,18 +21,10 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Debug|ARM.ActiveCfg = Debug|ARM
-		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Debug|ARM.Build.0 = Debug|ARM
-		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Debug|ARM64.Build.0 = Debug|ARM64
 		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Debug|x64.ActiveCfg = Debug|x64
 		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Debug|x64.Build.0 = Debug|x64
 		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Debug|x86.ActiveCfg = Debug|Win32
 		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Debug|x86.Build.0 = Debug|Win32
-		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Release|ARM.ActiveCfg = Release|ARM
-		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Release|ARM.Build.0 = Release|ARM
-		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Release|ARM64.ActiveCfg = Release|ARM64
-		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Release|ARM64.Build.0 = Release|ARM64
 		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Release|x64.ActiveCfg = Release|x64
 		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Release|x64.Build.0 = Release|x64
 		{BEF30B4A-6826-4166-B11E-5BB8E6FB8682}.Release|x86.ActiveCfg = Release|Win32
@@ -53,18 +45,10 @@ Global
 		{EF987F12-27EC-4300-8B20-63A2C7156AFC}.Release|x64.Build.0 = Release|x64
 		{EF987F12-27EC-4300-8B20-63A2C7156AFC}.Release|x86.ActiveCfg = Release|Win32
 		{EF987F12-27EC-4300-8B20-63A2C7156AFC}.Release|x86.Build.0 = Release|Win32
-		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Debug|ARM.ActiveCfg = Debug|ARM
-		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Debug|ARM.Build.0 = Debug|ARM
-		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Debug|ARM64.Build.0 = Debug|ARM64
 		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Debug|x64.ActiveCfg = Debug|x64
 		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Debug|x64.Build.0 = Debug|x64
 		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Debug|x86.ActiveCfg = Debug|Win32
 		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Debug|x86.Build.0 = Debug|Win32
-		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Release|ARM.ActiveCfg = Release|ARM
-		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Release|ARM.Build.0 = Release|ARM
-		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Release|ARM64.Build.0 = Release|ARM64
 		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Release|x64.ActiveCfg = Release|x64
 		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Release|x64.Build.0 = Release|x64
 		{E243D17B-648E-429B-ABEB-113B9175FB6C}.Release|x86.ActiveCfg = Release|Win32