Merge branch 'master' into sidequest/store-received-savegames-in-save-folder

Author: Flamefire

external/libutil

@@ -11,3 +11,18 @@ add_library(audioMockup STATIC MockupAudioDriver.h MockupAudioDriver.cpp)
 target_link_libraries(audioMockup PUBLIC audiodrv turtle::turtle)
 target_include_directories(audioMockup INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/..)
 enable_warnings(audioMockup)
+
+# Turtle does not support override for mocked methods, so let's disable the warning
+include(CheckAndAddWarnings)
+
+check_warning(CXX "-Wno-suggest-override" CXX_WARNING__Wno_suggest_override_SUPPORTED)
+
+if (CXX_WARNING__Wno_suggest_override_SUPPORTED)
+	add_library(no_suggest_override INTERFACE)
+	target_compile_options(no_suggest_override INTERFACE
+		$<$<COMPILE_LANGUAGE:CXX>:-Wno-suggest-override>
+	)
+
+    target_link_libraries(videoMockup PRIVATE no_suggest_override)
+    target_link_libraries(audioMockup PRIVATE no_suggest_override)
+endif()