Просмотр исходного кода

fix: Fixes compiling to non-Apple OSes on arm64

Exverge 2 лет назад
Родитель
Сommit
93dc7fb6b2
2 измененных файлов с 3 добавлено и 1 удалено
  1. 2 0
      src/core/arm/nce/visitor_base.h
  2. 1 1
      src/video_core/CMakeLists.txt

+ 2 - 0
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 {

+ 1 - 1
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)