From 4166d55ff4cadbc9cecb4e483ddb2d1c831c544e Mon Sep 17 00:00:00 2001
From: sekrit-twc <noreply@example.com>
Date: Fri, 13 Oct 2017 21:14:42 -0700
Subject: [PATCH] msvc: add ARM64 configuration

---
 _msvc/dll_universal/dll_universal.vcxproj   | 63 ++++++++++++--
 _msvc/zimg.sln                              | 94 ++++++++++++++-------
 _msvc/zimg_universal/zimg_universal.vcxproj | 55 +++++++++++-
 3 files changed, 170 insertions(+), 42 deletions(-)

diff --git a/_msvc/dll_universal/dll_universal.vcxproj b/_msvc/dll_universal/dll_universal.vcxproj
index 26aabb53..27d1aada 100644
--- a/_msvc/dll_universal/dll_universal.vcxproj
+++ b/_msvc/dll_universal/dll_universal.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|ARM">
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\dummy.cpp" />
@@ -34,12 +42,23 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -48,25 +67,33 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+    <TargetName>z</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <TargetName>z</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+    <TargetName>z</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <TargetName>z</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
     <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -80,8 +107,8 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
     <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -93,6 +120,30 @@
       <ImportLibrary>$(OutDir)$(TargetName)_imp.lib</ImportLibrary>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>z.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>$(ProjectDir)..\zimg.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>$(OutDir)..\zimg_universal</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>z.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>$(ProjectDir)..\zimg.def</ModuleDefinitionFile>
+      <AdditionalLibraryDirectories>$(OutDir)..\zimg_universal</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/_msvc/zimg.sln b/_msvc/zimg.sln
index 2c96cad3..4b47ec27 100644
--- a/_msvc/zimg.sln
+++ b/_msvc/zimg.sln
@@ -68,127 +68,157 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Debug|ARM.ActiveCfg = Debug|Win32
+		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Debug|Win32.Build.0 = Debug|Win32
 		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Debug|x64.ActiveCfg = Debug|x64
 		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Debug|x64.Build.0 = Debug|x64
-		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Release|ARM.ActiveCfg = Release|Win32
-		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Release|Win32.ActiveCfg = Release|Win32
-		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Release|Win32.Build.0 = Release|Win32
+		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Release|ARM.ActiveCfg = Debug|Win32
+		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Release|ARM64.ActiveCfg = Debug|Win32
+		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Release|Win32.ActiveCfg = Debug|Win32
+		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Release|Win32.Build.0 = Debug|Win32
 		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Release|x64.ActiveCfg = Release|x64
 		{B85E6CC0-ED80-487D-805A-DA3597A15CE6}.Release|x64.Build.0 = Release|x64
 		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Debug|ARM.ActiveCfg = Debug|Win32
+		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Debug|Win32.ActiveCfg = Debug|Win32
 		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Debug|Win32.Build.0 = Debug|Win32
 		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Debug|x64.ActiveCfg = Debug|x64
 		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Debug|x64.Build.0 = Debug|x64
-		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Release|ARM.ActiveCfg = Release|Win32
-		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Release|Win32.ActiveCfg = Release|Win32
-		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Release|Win32.Build.0 = Release|Win32
+		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Release|ARM.ActiveCfg = Debug|Win32
+		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Release|ARM64.ActiveCfg = Debug|Win32
+		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Release|Win32.ActiveCfg = Debug|Win32
+		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Release|Win32.Build.0 = Debug|Win32
 		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Release|x64.ActiveCfg = Release|x64
 		{66EEC0BD-2C32-4B40-A180-B4C25B484D23}.Release|x64.Build.0 = Release|x64
 		{3849AF96-797C-4322-AD39-810D8367684D}.Debug|ARM.ActiveCfg = Debug|Win32
+		{3849AF96-797C-4322-AD39-810D8367684D}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{3849AF96-797C-4322-AD39-810D8367684D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3849AF96-797C-4322-AD39-810D8367684D}.Debug|Win32.Build.0 = Debug|Win32
 		{3849AF96-797C-4322-AD39-810D8367684D}.Debug|x64.ActiveCfg = Debug|x64
 		{3849AF96-797C-4322-AD39-810D8367684D}.Debug|x64.Build.0 = Debug|x64
-		{3849AF96-797C-4322-AD39-810D8367684D}.Release|ARM.ActiveCfg = Release|Win32
-		{3849AF96-797C-4322-AD39-810D8367684D}.Release|Win32.ActiveCfg = Release|Win32
-		{3849AF96-797C-4322-AD39-810D8367684D}.Release|Win32.Build.0 = Release|Win32
+		{3849AF96-797C-4322-AD39-810D8367684D}.Release|ARM.ActiveCfg = Debug|Win32
+		{3849AF96-797C-4322-AD39-810D8367684D}.Release|ARM64.ActiveCfg = Debug|Win32
+		{3849AF96-797C-4322-AD39-810D8367684D}.Release|Win32.ActiveCfg = Debug|Win32
+		{3849AF96-797C-4322-AD39-810D8367684D}.Release|Win32.Build.0 = Debug|Win32
 		{3849AF96-797C-4322-AD39-810D8367684D}.Release|x64.ActiveCfg = Release|x64
 		{3849AF96-797C-4322-AD39-810D8367684D}.Release|x64.Build.0 = Release|x64
 		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Debug|ARM.ActiveCfg = Debug|Win32
+		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Debug|Win32.Build.0 = Debug|Win32
 		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Debug|x64.ActiveCfg = Debug|x64
 		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Debug|x64.Build.0 = Debug|x64
-		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Release|ARM.ActiveCfg = Release|Win32
-		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Release|Win32.ActiveCfg = Release|Win32
-		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Release|Win32.Build.0 = Release|Win32
+		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Release|ARM.ActiveCfg = Debug|Win32
+		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Release|ARM64.ActiveCfg = Debug|Win32
+		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Release|Win32.ActiveCfg = Debug|Win32
+		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Release|Win32.Build.0 = Debug|Win32
 		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Release|x64.ActiveCfg = Release|x64
 		{A8C79983-2F34-4E94-A86C-C44130FAB928}.Release|x64.Build.0 = Release|x64
 		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Debug|ARM.ActiveCfg = Debug|Win32
+		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Debug|Win32.Build.0 = Debug|Win32
 		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Debug|x64.ActiveCfg = Debug|x64
 		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Debug|x64.Build.0 = Debug|x64
-		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Release|ARM.ActiveCfg = Release|Win32
-		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Release|Win32.ActiveCfg = Release|Win32
-		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Release|Win32.Build.0 = Release|Win32
+		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Release|ARM.ActiveCfg = Debug|Win32
+		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Release|ARM64.ActiveCfg = Debug|Win32
+		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Release|Win32.ActiveCfg = Debug|Win32
+		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Release|Win32.Build.0 = Debug|Win32
 		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Release|x64.ActiveCfg = Release|x64
 		{6D8D14B2-6D32-45E3-A205-AA74DE2FBE7F}.Release|x64.Build.0 = Release|x64
 		{C8629E57-4D6F-40FA-82FC-B39824195932}.Debug|ARM.ActiveCfg = Debug|Win32
+		{C8629E57-4D6F-40FA-82FC-B39824195932}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{C8629E57-4D6F-40FA-82FC-B39824195932}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C8629E57-4D6F-40FA-82FC-B39824195932}.Debug|Win32.Build.0 = Debug|Win32
 		{C8629E57-4D6F-40FA-82FC-B39824195932}.Debug|x64.ActiveCfg = Debug|x64
 		{C8629E57-4D6F-40FA-82FC-B39824195932}.Debug|x64.Build.0 = Debug|x64
-		{C8629E57-4D6F-40FA-82FC-B39824195932}.Release|ARM.ActiveCfg = Release|Win32
-		{C8629E57-4D6F-40FA-82FC-B39824195932}.Release|Win32.ActiveCfg = Release|Win32
-		{C8629E57-4D6F-40FA-82FC-B39824195932}.Release|Win32.Build.0 = Release|Win32
+		{C8629E57-4D6F-40FA-82FC-B39824195932}.Release|ARM.ActiveCfg = Debug|Win32
+		{C8629E57-4D6F-40FA-82FC-B39824195932}.Release|ARM64.ActiveCfg = Debug|Win32
+		{C8629E57-4D6F-40FA-82FC-B39824195932}.Release|Win32.ActiveCfg = Debug|Win32
+		{C8629E57-4D6F-40FA-82FC-B39824195932}.Release|Win32.Build.0 = Debug|Win32
 		{C8629E57-4D6F-40FA-82FC-B39824195932}.Release|x64.ActiveCfg = Release|x64
 		{C8629E57-4D6F-40FA-82FC-B39824195932}.Release|x64.Build.0 = Release|x64
 		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Debug|ARM.ActiveCfg = Debug|Win32
+		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Debug|Win32.ActiveCfg = Debug|Win32
 		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Debug|Win32.Build.0 = Debug|Win32
 		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Debug|x64.ActiveCfg = Debug|x64
 		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Debug|x64.Build.0 = Debug|x64
-		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Release|ARM.ActiveCfg = Release|Win32
-		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Release|Win32.ActiveCfg = Release|Win32
-		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Release|Win32.Build.0 = Release|Win32
+		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Release|ARM.ActiveCfg = Debug|Win32
+		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Release|ARM64.ActiveCfg = Debug|Win32
+		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Release|Win32.ActiveCfg = Debug|Win32
+		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Release|Win32.Build.0 = Debug|Win32
 		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Release|x64.ActiveCfg = Release|x64
 		{DDD98DB2-2ABE-4550-9F8C-0E4E4E991D73}.Release|x64.Build.0 = Release|x64
 		{3C822249-7551-4086-AF0B-F43871F36191}.Debug|ARM.ActiveCfg = Debug|Win32
+		{3C822249-7551-4086-AF0B-F43871F36191}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{3C822249-7551-4086-AF0B-F43871F36191}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3C822249-7551-4086-AF0B-F43871F36191}.Debug|Win32.Build.0 = Debug|Win32
 		{3C822249-7551-4086-AF0B-F43871F36191}.Debug|x64.ActiveCfg = Debug|x64
 		{3C822249-7551-4086-AF0B-F43871F36191}.Debug|x64.Build.0 = Debug|x64
-		{3C822249-7551-4086-AF0B-F43871F36191}.Release|ARM.ActiveCfg = Release|Win32
-		{3C822249-7551-4086-AF0B-F43871F36191}.Release|Win32.ActiveCfg = Release|Win32
-		{3C822249-7551-4086-AF0B-F43871F36191}.Release|Win32.Build.0 = Release|Win32
+		{3C822249-7551-4086-AF0B-F43871F36191}.Release|ARM.ActiveCfg = Debug|Win32
+		{3C822249-7551-4086-AF0B-F43871F36191}.Release|ARM64.ActiveCfg = Debug|Win32
+		{3C822249-7551-4086-AF0B-F43871F36191}.Release|Win32.ActiveCfg = Debug|Win32
+		{3C822249-7551-4086-AF0B-F43871F36191}.Release|Win32.Build.0 = Debug|Win32
 		{3C822249-7551-4086-AF0B-F43871F36191}.Release|x64.ActiveCfg = Release|x64
 		{3C822249-7551-4086-AF0B-F43871F36191}.Release|x64.Build.0 = Release|x64
 		{DBBFB1CB-5854-490C-B549-63F7B8FBE1F2}.Debug|ARM.ActiveCfg = Debug|ARM
 		{DBBFB1CB-5854-490C-B549-63F7B8FBE1F2}.Debug|ARM.Build.0 = Debug|ARM
+		{DBBFB1CB-5854-490C-B549-63F7B8FBE1F2}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{DBBFB1CB-5854-490C-B549-63F7B8FBE1F2}.Debug|ARM64.Build.0 = Debug|ARM64
 		{DBBFB1CB-5854-490C-B549-63F7B8FBE1F2}.Debug|Win32.ActiveCfg = Debug|ARM
 		{DBBFB1CB-5854-490C-B549-63F7B8FBE1F2}.Debug|x64.ActiveCfg = Debug|ARM
 		{DBBFB1CB-5854-490C-B549-63F7B8FBE1F2}.Release|ARM.ActiveCfg = Release|ARM
 		{DBBFB1CB-5854-490C-B549-63F7B8FBE1F2}.Release|ARM.Build.0 = Release|ARM
-		{DBBFB1CB-5854-490C-B549-63F7B8FBE1F2}.Release|Win32.ActiveCfg = Release|ARM
+		{DBBFB1CB-5854-490C-B549-63F7B8FBE1F2}.Release|ARM64.ActiveCfg = Release|ARM64
+		{DBBFB1CB-5854-490C-B549-63F7B8FBE1F2}.Release|ARM64.Build.0 = Release|ARM64
+		{DBBFB1CB-5854-490C-B549-63F7B8FBE1F2}.Release|Win32.ActiveCfg = Debug|ARM
 		{DBBFB1CB-5854-490C-B549-63F7B8FBE1F2}.Release|x64.ActiveCfg = Release|ARM
 		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Debug|ARM.ActiveCfg = Debug|Win32
+		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Debug|Win32.Build.0 = Debug|Win32
 		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Debug|x64.ActiveCfg = Debug|x64
 		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Debug|x64.Build.0 = Debug|x64
-		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Release|ARM.ActiveCfg = Release|Win32
-		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Release|Win32.ActiveCfg = Release|Win32
-		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Release|Win32.Build.0 = Release|Win32
+		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Release|ARM.ActiveCfg = Debug|Win32
+		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Release|ARM64.ActiveCfg = Debug|Win32
+		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Release|Win32.ActiveCfg = Debug|Win32
+		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Release|Win32.Build.0 = Debug|Win32
 		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Release|x64.ActiveCfg = Release|x64
 		{96822C64-B0B6-49F3-A24C-F9C5FDB02DD3}.Release|x64.Build.0 = Release|x64
 		{DC46DBC0-F7BB-40F1-B57F-DC884057340F}.Debug|ARM.ActiveCfg = Debug|ARM
 		{DC46DBC0-F7BB-40F1-B57F-DC884057340F}.Debug|ARM.Build.0 = Debug|ARM
+		{DC46DBC0-F7BB-40F1-B57F-DC884057340F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{DC46DBC0-F7BB-40F1-B57F-DC884057340F}.Debug|ARM64.Build.0 = Debug|ARM64
 		{DC46DBC0-F7BB-40F1-B57F-DC884057340F}.Debug|Win32.ActiveCfg = Debug|ARM
 		{DC46DBC0-F7BB-40F1-B57F-DC884057340F}.Debug|x64.ActiveCfg = Debug|ARM
 		{DC46DBC0-F7BB-40F1-B57F-DC884057340F}.Release|ARM.ActiveCfg = Release|ARM
 		{DC46DBC0-F7BB-40F1-B57F-DC884057340F}.Release|ARM.Build.0 = Release|ARM
-		{DC46DBC0-F7BB-40F1-B57F-DC884057340F}.Release|Win32.ActiveCfg = Release|ARM
+		{DC46DBC0-F7BB-40F1-B57F-DC884057340F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{DC46DBC0-F7BB-40F1-B57F-DC884057340F}.Release|ARM64.Build.0 = Release|ARM64
+		{DC46DBC0-F7BB-40F1-B57F-DC884057340F}.Release|Win32.ActiveCfg = Debug|ARM
 		{DC46DBC0-F7BB-40F1-B57F-DC884057340F}.Release|x64.ActiveCfg = Release|ARM
 		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Debug|ARM.ActiveCfg = Debug|Win32
+		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Debug|Win32.Build.0 = Debug|Win32
 		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Debug|x64.ActiveCfg = Debug|x64
 		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Debug|x64.Build.0 = Debug|x64
-		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Release|ARM.ActiveCfg = Release|Win32
-		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Release|Win32.ActiveCfg = Release|Win32
-		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Release|Win32.Build.0 = Release|Win32
+		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Release|ARM.ActiveCfg = Debug|Win32
+		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Release|ARM64.ActiveCfg = Debug|Win32
+		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Release|Win32.ActiveCfg = Debug|Win32
+		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Release|Win32.Build.0 = Debug|Win32
 		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Release|x64.ActiveCfg = Release|x64
 		{613FBE86-C438-4F7C-AB69-4C024C5305D5}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
diff --git a/_msvc/zimg_universal/zimg_universal.vcxproj b/_msvc/zimg_universal/zimg_universal.vcxproj
index 19ab40c6..c156afd2 100644
--- a/_msvc/zimg_universal/zimg_universal.vcxproj
+++ b/_msvc/zimg_universal/zimg_universal.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|ARM">
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\zimg\api\zimg.cpp" />
@@ -96,12 +104,23 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -110,26 +129,39 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <GenerateManifest>false</GenerateManifest>
     <TargetName>z</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <GenerateManifest>false</GenerateManifest>
+    <TargetName>z</TargetName>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <GenerateManifest>false</GenerateManifest>
     <TargetName>z</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <GenerateManifest>false</GenerateManifest>
+    <TargetName>z</TargetName>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\src\zimg;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -140,10 +172,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\src\zimg;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAsWinRT>false</CompileAsWinRT>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -151,6 +182,22 @@
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src\zimg;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAsWinRT>false</CompileAsWinRT>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src\zimg;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAsWinRT>false</CompileAsWinRT>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>