From 93dc7fb6b2bb1df8c6ee9fbb5d37b7727f77f762 Mon Sep 17 00:00:00 2001
From: Exverge <exverge@exverge.xyz>
Date: Mon, 18 Mar 2024 23:11:32 +0000
Subject: [PATCH] fix: Fixes compiling to non-Apple OSes on arm64

---
 src/core/arm/nce/visitor_base.h | 2 ++
 src/video_core/CMakeLists.txt   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/arm/nce/visitor_base.h b/src/core/arm/nce/visitor_base.h
index 6a2be3d9bc..c885ac47f4 100644
--- a/src/core/arm/nce/visitor_base.h
+++ b/src/core/arm/nce/visitor_base.h
@@ -11,6 +11,8 @@
 #include <dynarmic/frontend/A64/decoder/a64.h>
 #include <dynarmic/frontend/imm.h>
 
+#include "common/common_types.h"
+
 #pragma GCC diagnostic pop
 
 namespace Core {
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index de28bf92ba..36affdf4f0 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -408,7 +408,7 @@ if (MSVC)
         /we4244 # 'conversion': conversion from 'type1' to 'type2', possible loss of data
     )
 else()
-    if (APPLE)
+    if (APPLE OR ARCHITECTURE_arm64)
         # error: declaration shadows a typedef in 'interval_base_set<SubType, DomainT, Compare, Interval, Alloc>'
         # error: implicit conversion loses integer precision: 'int' to 'boost::icl::bound_type' (aka 'unsigned char')
         target_compile_options(video_core PRIVATE -Wno-shadow -Wno-unused-local-typedef)