Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[linux] fix aarch64 builds (again) + fix with slightly outdated qt (#2612)

lizzie9f423a24b82e
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef3c0bef6e..f5d7126f92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -895,13 +895,13 @@ if (MSVC AND CXX_CLANG)
endif()
if (YUZU_USE_FASTER_LD)
+ # fallback if everything fails (bfd)
+ set(LINKER bfd)
# clang should always use lld
find_program(LLD lld)
-
if (LLD)
set(LINKER lld)
endif()
-
# GNU appears to work better with mold
# TODO: mold has been slow lately, see if better options exist (search for gold?)
if (CXX_GCC)
@@ -910,7 +910,6 @@ if (YUZU_USE_FASTER_LD)
set(LINKER mold)
endif()
endif()
-
message(NOTICE "Selecting ${LINKER} as linker")
add_link_options("-fuse-ld=${LINKER}")
endif()
diff --git a/src/dynarmic/tests/CMakeLists.txt b/src/dynarmic/tests/CMakeLists.txt
index 4ace6c2afd..df90168a52 100644
--- a/src/dynarmic/tests/CMakeLists.txt
+++ b/src/dynarmic/tests/CMakeLists.txt
@@ -135,6 +135,8 @@ target_include_directories(dynarmic_tests PRIVATE . ../src)
target_compile_options(dynarmic_tests PRIVATE ${DYNARMIC_CXX_FLAGS})
target_compile_definitions(dynarmic_tests PRIVATE FMT_USE_USER_DEFINED_LITERALS=1)
-target_compile_options(dynarmic_tests PRIVATE -mavx2)
+if ("x86_64" IN_LIST ARCHITECTURE)
+ target_compile_options(dynarmic_tests PRIVATE -mavx2)
+endif()
add_test(dynarmic_tests dynarmic_tests --durations yes)
diff --git a/src/yuzu/configuration/shared_widget.h b/src/yuzu/configuration/shared_widget.h
index 9e718098a3..dd5d5b7257 100644
--- a/src/yuzu/configuration/shared_widget.h
+++ b/src/yuzu/configuration/shared_widget.h
@@ -13,6 +13,7 @@
#include <QString>
#include <QStringLiteral>
#include <QWidget>
+#include <QObject>
#include <qobjectdefs.h>
#include "qt_common/shared_translation.h"