VERY experimental Nintendo Switch 2 emulator
C++
common,yuzu-qt: Avoid explicit instantiation on old clang
lat9nqa7a32ab8a02a
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txtindex 09e7e673e6..cf05ae3640 100644--- a/src/common/CMakeLists.txt+++ b/src/common/CMakeLists.txt@@ -197,10 +197,15 @@ if (MSVC)/we4254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data/we4800 # Implicit conversion from 'type' to bool. Possible information loss)-else()+endif()++if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")target_compile_options(common PRIVATE- $<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>- $<$<CXX_COMPILER_ID:Clang>:-Werror=unreachable-code-aggressive>+ -fsized-deallocation+ -Werror=unreachable-code-aggressive+ )+ target_compile_definitions(common PRIVATE+ $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:_CANNOT_EXPLICITLY_INSTANTIATE>)endif()diff --git a/src/common/settings.cpp b/src/common/settings.cppindex a1cc76a38a..f4eb2d2fbe 100644--- a/src/common/settings.cpp+++ b/src/common/settings.cpp@@ -25,6 +25,7 @@namespace Settings {+#ifndef _CANNOT_EXPLICITLY_INSTANTIATE#define SETTING(TYPE, RANGED) template class Setting<TYPE, RANGED>#define SWITCHABLE(TYPE, RANGED) template class SwitchableSetting<TYPE, RANGED>@@ -61,6 +62,7 @@ SWITCHABLE(u8, true);#undef SETTING#undef SWITCHABLE+#endifValues values;diff --git a/src/common/settings.h b/src/common/settings.hindex e510036b48..35fa4cf3de 100644--- a/src/common/settings.h+++ b/src/common/settings.h@@ -45,6 +45,7 @@ struct ResolutionScalingInfo {}};+#ifndef _CANNOT_EXPLICITLY_INSTANTIATE// Instantiate the classes elsewhere (settings.cpp) to reduce compiler/linker work#define SETTING(TYPE, RANGED) extern template class Setting<TYPE, RANGED>#define SWITCHABLE(TYPE, RANGED) extern template class SwitchableSetting<TYPE, RANGED>@@ -84,6 +85,7 @@ SWITCHABLE(u8, true);#undef SETTING#undef SWITCHABLE+#endif/*** The InputSetting class allows for getting a reference to either the global or custom members.diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txtindex 899b758717..5183aabdfe 100644--- a/src/yuzu/CMakeLists.txt+++ b/src/yuzu/CMakeLists.txt@@ -235,6 +235,12 @@ if (WIN32 AND YUZU_CRASH_DUMPS)target_compile_definitions(yuzu PRIVATE -DYUZU_DBGHELP)endif()+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")+ target_compile_definitions(yuzu PRIVATE+ $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:_CANNOT_EXPLICITLY_INSTANTIATE>+ )+endif()+file(GLOB COMPAT_LIST${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cppindex 2a02a27bc6..41e2493b3b 100644--- a/src/yuzu/uisettings.cpp+++ b/src/yuzu/uisettings.cpp@@ -3,6 +3,7 @@#include "yuzu/uisettings.h"+#ifndef _CANNOT_EXPLICITLY_INSTANTIATEnamespace Settings {template class Setting<bool>;template class Setting<std::string>;@@ -12,6 +13,7 @@ template class Setting<u8, true>;template class Setting<u8>;template class Setting<unsigned long long>;} // namespace Settings+#endifnamespace UISettings {diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.hindex 2152b0b3bf..08049f9c45 100644--- a/src/yuzu/uisettings.h+++ b/src/yuzu/uisettings.h@@ -17,6 +17,7 @@using Settings::Category;using Settings::Setting;+#ifndef _CANNOT_EXPLICITLY_INSTANTIATEnamespace Settings {extern template class Setting<bool>;extern template class Setting<std::string>;@@ -26,6 +27,7 @@ extern template class Setting<u8, true>;extern template class Setting<u8>;extern template class Setting<unsigned long long>;} // namespace Settings+#endifnamespace UISettings {