From c891e842597d3e08903c5aa0503118e3b688871b Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 5 Nov 2020 16:34:00 +0100
Subject: api: include arm64 in amd64

ARM64 will still run AMD64 apps.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 api/entry.h      | 2 +-
 api/resources.rc | 2 +-
 wintun.proj      | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/api/entry.h b/api/entry.h
index ac37680..c58b7cc 100644
--- a/api/entry.h
+++ b/api/entry.h
@@ -8,7 +8,7 @@
 #include <Windows.h>
 
 /* TODO: Replace with is_defined. MSVC has issues with the linux kernel varadic macro trick for this. */
-#if defined(_M_IX86) || defined(_M_ARM)
+#if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM)
 #    define MAYBE_WOW64 1
 #else
 #    define MAYBE_WOW64 0
diff --git a/api/resources.rc b/api/resources.rc
index 5716b9d..1e0646b 100644
--- a/api/resources.rc
+++ b/api/resources.rc
@@ -19,7 +19,7 @@ wintun-whql.sys RCDATA "whql\\wintun.sys"
 #if defined(_M_IX86)
 wintun-amd64.dll RCDATA "amd64\\wintun.dll"
 #endif
-#if defined(_M_IX86) || defined(_M_ARM)
+#if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM)
 wintun-arm64.dll RCDATA "arm64\\wintun.dll"
 #endif
 
diff --git a/wintun.proj b/wintun.proj
index 1e8a3a4..73060f2 100644
--- a/wintun.proj
+++ b/wintun.proj
@@ -83,7 +83,8 @@
     <MSBuild Projects="api\api.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=Win32" />
   </Target>
   <Target Name="Dll-amd64"
-    Outputs="$(Configuration)\amd64\wintun.dll">
+    Outputs="$(Configuration)\amd64\wintun.dll"
+    DependsOnTargets="Dll-arm64">
     <MSBuild Projects="api\api.vcxproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=x64" />
   </Target>
   <Target Name="Dll-arm"
-- 
cgit v1.2.3-59-g8ed1b