VERY experimental Nintendo Switch 2 emulator
C++
[cmake, build] fix android and aarch64 (#103)
lizzie016ebf3cd880
diff --git a/CMakeLists.txt b/CMakeLists.txtindex bb571235a1..184993b96a 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -415,7 +415,7 @@ if(ENABLE_OPENSSL)find_package(OpenSSL 1.1.1 REQUIRED)endif()-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ANDROID)find_package(gamemode 1.7 MODULE)endif()diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txtindex 3668193071..c08c9b7f2d 100644--- a/externals/CMakeLists.txt+++ b/externals/CMakeLists.txt@@ -211,7 +211,7 @@ if (ANDROID)endif()endif()-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT TARGET gamemode::headers)+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ANDROID AND NOT TARGET gamemode::headers)add_library(gamemode INTERFACE)target_include_directories(gamemode INTERFACE gamemode)add_library(gamemode::headers ALIAS gamemode)diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txtindex 974c05dec9..8e167c51d9 100644--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@ -1212,7 +1212,7 @@ if (HAS_NCE)arm/nce/patcher.harm/nce/visitor_base.h)- target_link_libraries(core PRIVATE merry::oaknut)+ target_link_libraries(core PRIVATE merry::mcl merry::oaknut)endif()if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)