VERY experimental Nintendo Switch 2 emulator
C++
[ci] improve ccache and add support on Android (#2673)
Caio Oliveira9acb6006b858
diff --git a/CMakeLists.txt b/CMakeLists.txtindex f436c0a183..1b69782a23 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -287,6 +287,13 @@ if (ANDROID)set(CMAKE_POLICY_VERSION_MINIMUM 3.5) # Workaround for Oboeendif()+# We need to downgrade debug info (/Zi -> /Z7) to use an older but more cacheable format+# See https://github.com/nanoant/CMakePCHCompiler/issues/21+if(WIN32 AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))+ string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")+ string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")+endif()+# Default to a Release buildget_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE)diff --git a/docs/build/Android.md b/docs/build/Android.mdindex c8ff3a3b1e..f511f71370 100644--- a/docs/build/Android.md+++ b/docs/build/Android.md@@ -33,6 +33,7 @@ Eden by default will be cloned into -4. Navigate to `eden/src/android`.5. Then Build with `./gradlew assembleRelWithDebInfo`.6. To build the optimised build use `./gradlew assembleGenshinSpoofRelWithDebInfo`.+7. You can pass extra variables to cmake via `-PYUZU_ANDROID_ARGS="-D..."`### ScriptA convenience script for building is provided in `.ci/android/build.sh`. The built APK can be put into an `artifacts` directory via `.ci/android/package.sh`. On Windows, these must be done in the Git Bash or MinGW terminal.diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txtindex 434e6fb100..2da461fd5c 100644--- a/externals/CMakeLists.txt+++ b/externals/CMakeLists.txt@@ -155,12 +155,14 @@ if (YUZU_USE_BUNDLED_SIRIT)AddJsonPackage(sirit-ci)else()AddJsonPackage(sirit)- if(MSVC AND USE_CCACHE AND sirit_ADDED)- get_target_property(_opts sirit COMPILE_OPTIONS)- list(FILTER _opts EXCLUDE REGEX "/Zi")- list(APPEND _opts "/Z7")- set_target_properties(siritobj PROPERTIES COMPILE_OPTIONS "${_opts}")- elseif(MSVC AND CXX_CLANG)+ # Change to old-but-more-cacheable debug info on Windows+ if (WIN32 AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))+ get_target_property(sirit_opts sirit COMPILE_OPTIONS)+ list(FILTER sirit_opts EXCLUDE REGEX "/Zi")+ list(APPEND sirit_opts "/Z7")+ set_target_properties(sirit PROPERTIES COMPILE_OPTIONS "${sirit_opts}")+ endif()+ if(MSVC AND CXX_CLANG)target_compile_options(siritobj PRIVATE -Wno-error=unused-command-line-argument)endif()endif()diff --git a/src/CMakeLists.txt b/src/CMakeLists.txtindex 88470c4c42..0f3c5cfd4b 100644--- a/src/CMakeLists.txt+++ b/src/CMakeLists.txt@@ -101,15 +101,9 @@ if (MSVC AND NOT CXX_CLANG))endif()- if (USE_CCACHE OR YUZU_USE_PRECOMPILED_HEADERS)- # when caching, we need to use /Z7 to downgrade debug info to use an older but more cacheable format- # Precompiled headers are deleted if not using /Z7. See https://github.com/nanoant/CMakePCHCompiler/issues/21- add_compile_options(/Z7)- # Avoid D9025 warning- string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")- string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")- else()- add_compile_options(/Zi)+ if (WIN32 AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))+ string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")+ string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")endif()if (ARCHITECTURE_x86_64)diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.ktsindex c85da039cb..31db36199a 100644--- a/src/android/app/build.gradle.kts+++ b/src/android/app/build.gradle.kts@@ -75,6 +75,8 @@ android {externalNativeBuild {cmake {+ val extraCMakeArgs = (project.findProperty("YUZU_ANDROID_ARGS") as String?)?.split("\\s+".toRegex()) ?: emptyList()+arguments.addAll(listOf("-DENABLE_QT=0", // Don't use QT"-DENABLE_SDL2=0", // Don't use SDL@@ -87,7 +89,8 @@ android {"-DCMAKE_EXPORT_COMPILE_COMMANDS=ON","-DBUILD_TESTING=OFF","-DYUZU_TESTS=OFF",- "-DDYNARMIC_TESTS=OFF"+ "-DDYNARMIC_TESTS=OFF",+ *extraCMakeArgs.toTypedArray()))abiFilters("arm64-v8a")diff --git a/src/dynarmic/CMakeLists.txt b/src/dynarmic/CMakeLists.txtindex 6b3308fb54..e5345ef458 100644--- a/src/dynarmic/CMakeLists.txt+++ b/src/dynarmic/CMakeLists.txt@@ -25,11 +25,7 @@ option(DYNARMIC_IGNORE_ASSERTS "Ignore asserts" OFF)option(DYNARMIC_TESTS_USE_UNICORN "Enable fuzzing tests against unicorn" OFF)CMAKE_DEPENDENT_OPTION(DYNARMIC_USE_LLVM "Support disassembly of jitted x86_64 code using LLVM" OFF "NOT YUZU_DISABLE_LLVM" OFF)-if (PLATFORM_OPENBSD)- option(DYNARMIC_USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF)-else()- option(DYNARMIC_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)-endif()+option(DYNARMIC_USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF)option(DYNARMIC_INSTALL "Install dynarmic headers and CMake files" OFF)option(DYNARMIC_USE_BUNDLED_EXTERNALS "Use all bundled externals (useful when e.g. cross-compiling)" OFF)@@ -81,7 +77,6 @@ if (MSVC)/wd4592 # Symbol will be dynamically initialized (implementation limitation)/permissive- # Stricter C++ standards conformance/MP- /Zi/Zo/EHsc/Zc:externConstexpr # Allows external linkage for variables declared "extern constexpr", as the standard permits.@@ -91,6 +86,11 @@ if (MSVC)/bigobj # Increase number of sections in .obj files/DNOMINMAX)+ if (WIN32 AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))+ string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")+ string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")+ endif()+if (DYNARMIC_WARNINGS_AS_ERRORS)list(APPEND DYNARMIC_CXX_FLAGS/WX)diff --git a/src/dynarmic/src/dynarmic/backend/arm64/abi.h b/src/dynarmic/src/dynarmic/backend/arm64/abi.hindex ca7c9187db..635d64f062 100644--- a/src/dynarmic/src/dynarmic/backend/arm64/abi.h+++ b/src/dynarmic/src/dynarmic/backend/arm64/abi.h@@ -14,6 +14,7 @@#include <mcl/mp/metavalue/lift_value.hpp>#include "dynarmic/common/common_types.h"+#include "dynarmic/common/assert.h"#include <oaknut/oaknut.hpp>#include "dynarmic/common/always_false.h"diff --git a/src/dynarmic/src/dynarmic/common/assert.h b/src/dynarmic/src/dynarmic/common/assert.hindex 9973b8948d..0a3cb5331d 100644--- a/src/dynarmic/src/dynarmic/common/assert.h+++ b/src/dynarmic/src/dynarmic/common/assert.h@@ -23,6 +23,12 @@ template<typename... Ts>} \}())#endif+#ifndef ASSERT_FALSE+#define ASSERT_FALSE(...) \+ ([&]() { \+ assert_terminate("false", __VA_ARGS__); \+ }())+#endif#ifndef ASSERT#define ASSERT(_a_) ASSERT_MSG(_a_, "")diff --git a/src/dynarmic/src/dynarmic/common/memory_pool.h b/src/dynarmic/src/dynarmic/common/memory_pool.hindex c99316e107..d0a5223db3 100644--- a/src/dynarmic/src/dynarmic/common/memory_pool.h+++ b/src/dynarmic/src/dynarmic/common/memory_pool.h@@ -1,3 +1,6 @@+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project+// SPDX-License-Identifier: GPL-3.0-or-later+/* This file is part of the dynarmic project.* Copyright (c) 2016 MerryMage* SPDX-License-Identifier: 0BSD@@ -6,6 +9,7 @@#pragma once#include <cstddef>+#include <cstdlib>#include <vector>namespace Dynarmic::Common {diff --git a/src/dynarmic/src/dynarmic/ir/opt_passes.cpp b/src/dynarmic/src/dynarmic/ir/opt_passes.cppindex e9175f0e6b..25afde9b5d 100644--- a/src/dynarmic/src/dynarmic/ir/opt_passes.cpp+++ b/src/dynarmic/src/dynarmic/ir/opt_passes.cpp@@ -6,6 +6,7 @@* SPDX-License-Identifier: 0BSD*/+#include <algorithm>#include <cstdio>#include <map>