VERY experimental Nintendo Switch 2 emulator
C++
general: fix compilation on MinGW GCC 12
Liam79bf4bc3ff18
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txtindex 64361de5f0..bd01f4c4db 100644--- a/externals/CMakeLists.txt+++ b/externals/CMakeLists.txt@@ -40,6 +40,11 @@ target_include_directories(mbedtls PUBLIC ./mbedtls/include)add_library(microprofile INTERFACE)target_include_directories(microprofile INTERFACE ./microprofile)+# GCC bugs+if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND MINGW)+ target_compile_options(microprofile INTERFACE "-Wno-array-bounds")+endif()+# libusbif (NOT LIBUSB_FOUND OR YUZU_USE_BUNDLED_LIBUSB)add_subdirectory(libusb)diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cppindex 8a938aa839..8dd956fc61 100644--- a/src/core/loader/nso.cpp+++ b/src/core/loader/nso.cpp@@ -128,11 +128,10 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::// Apply patches if necessaryif (pm && (pm->HasNSOPatch(nso_header.build_id) || Settings::values.dump_nso)) {- std::vector<u8> pi_header;- pi_header.insert(pi_header.begin(), reinterpret_cast<u8*>(&nso_header),- reinterpret_cast<u8*>(&nso_header) + sizeof(NSOHeader));- pi_header.insert(pi_header.begin() + sizeof(NSOHeader), program_image.data(),- program_image.data() + program_image.size());+ std::vector<u8> pi_header(sizeof(NSOHeader) + program_image.size());+ std::memcpy(pi_header.data(), &nso_header, sizeof(NSOHeader));+ std::memcpy(pi_header.data() + sizeof(NSOHeader), program_image.data(),+ program_image.size());pi_header = pm->PatchNSO(pi_header, nso_file.GetName());diff --git a/src/video_core/macro/macro_jit_x64.cpp b/src/video_core/macro/macro_jit_x64.cppindex dc53765012..aca25d902b 100644--- a/src/video_core/macro/macro_jit_x64.cpp+++ b/src/video_core/macro/macro_jit_x64.cpp@@ -411,7 +411,7 @@ void MacroJITx64Impl::Compile_Branch(Macro::Opcode opcode) {Xbyak::Label end;auto value = Compile_GetRegister(opcode.src_a, eax);- test(value, value);+ cmp(value, 0); // test(value, value);if (optimizer.has_delayed_pc) {switch (opcode.branch_condition) {case Macro::BranchCondition::Zero: