diff options
| author | Exverge <exverge@exverge.xyz> | 2024-03-18 23:11:32 +0000 |
|---|---|---|
| committer | Mike Lothian <mike@fireburn.co.uk> | 2024-12-20 15:24:57 +0000 |
| commit | 41807019b6a4ec6e698e12c25429e74ae7b32d19 (patch) | |
| tree | 5ec1f913becfd41e20f5994c3a377c73246900be /src | |
| parent | 75b68c9170db0b8c5772d9139fa79e9f8a2cfd53 (diff) | |
fix: Fixes compiling to non-Apple OSes on arm64
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/arm/nce/visitor_base.h | 2 | ||||
| -rw-r--r-- | src/video_core/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/core/arm/nce/visitor_base.h b/src/core/arm/nce/visitor_base.h index 6a2be3d9b..c885ac47f 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 f2c7af529..c55369f08 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) |