VERY experimental Nintendo Switch 2 emulator
C++
android: Update ndk to 26.1.10909125
Charles Lombardobacfefe92c55
diff --git a/CMakeLists.txt b/CMakeLists.txtindex 2bef9d6ed2..1049a4cd80 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -11,7 +11,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modulinclude(DownloadExternals)include(CMakeDependentOption)include(CTest)-include(FetchContent)# Set bundled sdl2/qt as dependent options.# OFF by default, but if ENABLE_SDL2 and MSVC are true then ON@@ -99,47 +98,11 @@ if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL)DESTINATION "${vvl_lib_path}")endif()-# On Android, fetch and compile libcxx before doing anything elseif (ANDROID)set(CMAKE_SKIP_INSTALL_RULES ON)- set(LLVM_VERSION "15.0.6")-- # Note: even though libcxx and libcxxabi have separate releases on the project page,- # the separated releases cannot be compiled. Only in-tree builds work. Therefore we- # must fetch the source release for the entire llvm tree.- FetchContent_Declare(llvm- URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz"- URL_HASH SHA256=9d53ad04dc60cb7b30e810faf64c5ab8157dadef46c8766f67f286238256ff92- TLS_VERIFY TRUE- )- FetchContent_MakeAvailable(llvm)-- # libcxx has support for most of the range library, but it's gated behind a flag:- add_compile_definitions(_LIBCPP_ENABLE_EXPERIMENTAL)# Disable standard header inclusionset(ANDROID_STL "none")-- # libcxxabi- set(LIBCXXABI_INCLUDE_TESTS OFF)- set(LIBCXXABI_ENABLE_SHARED FALSE)- set(LIBCXXABI_ENABLE_STATIC TRUE)- set(LIBCXXABI_LIBCXX_INCLUDES "${LIBCXX_TARGET_INCLUDE_DIRECTORY}" CACHE STRING "" FORCE)- add_subdirectory("${llvm_SOURCE_DIR}/libcxxabi" "${llvm_BINARY_DIR}/libcxxabi")- link_libraries(cxxabi_static)-- # libcxx- set(LIBCXX_ABI_NAMESPACE "__ndk1" CACHE STRING "" FORCE)- set(LIBCXX_CXX_ABI "libcxxabi")- set(LIBCXX_INCLUDE_TESTS OFF)- set(LIBCXX_INCLUDE_BENCHMARKS OFF)- set(LIBCXX_INCLUDE_DOCS OFF)- set(LIBCXX_ENABLE_SHARED FALSE)- set(LIBCXX_ENABLE_STATIC TRUE)- set(LIBCXX_ENABLE_ASSERTIONS FALSE)- add_subdirectory("${llvm_SOURCE_DIR}/libcxx" "${llvm_BINARY_DIR}/libcxx")- set_target_properties(cxx-headers PROPERTIES INTERFACE_COMPILE_OPTIONS "-isystem${CMAKE_BINARY_DIR}/${LIBCXX_INSTALL_INCLUDE_DIR}")- link_libraries(cxx_static cxx-headers)endif()if (YUZU_USE_BUNDLED_VCPKG)diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.ktsindex 84a3308b70..b100862b2d 100644--- a/src/android/app/build.gradle.kts+++ b/src/android/app/build.gradle.kts@@ -27,7 +27,7 @@ android {namespace = "org.yuzu.yuzu_emu"compileSdkVersion = "android-34"- ndkVersion = "25.2.9519653"+ ndkVersion = "26.1.10909125"buildFeatures {viewBinding = true