From def7154dfb023f63822870f45e115e8be4035c3b Mon Sep 17 00:00:00 2001 From: niansa Date: Fri, 8 Mar 2024 18:59:53 +0000 Subject: [PATCH 1/6] Disable Android ktlintCheck for now as we don't currently support Android --- .ci/scripts/format/script.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh index f9c63dbfa3..e5f662128a 100755 --- a/.ci/scripts/format/script.sh +++ b/.ci/scripts/format/script.sh @@ -33,5 +33,5 @@ if [ ! -z "$DIFF" ]; then exit 1 fi -cd src/android -./gradlew ktlintCheck +#cd src/android +#./gradlew ktlintCheck From d3015162ac8801628ff9b5fd47885984b46996e1 Mon Sep 17 00:00:00 2001 From: niansa Date: Fri, 8 Mar 2024 19:19:32 +0000 Subject: [PATCH 2/6] Added format stage to CI --- .gitlab-ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c703f81d1..5fb4123fc5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ stages: - build + - format build-linux: stage: build @@ -14,3 +15,12 @@ build-linux: artifacts: paths: - artifacts/* + +clang-format: + stage: format + image: suyuemu/cibuild:latest + resource_group: linux-ci + variables: + RELEASE_NAME: mainline + script: + - bash .ci/scripts/format/script.sh From 6cd282b8e11f35e117ebfc2b494d9b1c487b6512 Mon Sep 17 00:00:00 2001 From: niansa Date: Fri, 8 Mar 2024 19:26:40 +0000 Subject: [PATCH 3/6] Run build stage after format stage --- .gitlab-ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5fb4123fc5..35155c50a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,15 @@ stages: - - build - format + - build + +clang-format: + stage: format + image: suyuemu/cibuild:latest + resource_group: linux-ci + variables: + RELEASE_NAME: mainline + script: + - bash .ci/scripts/format/script.sh build-linux: stage: build @@ -15,12 +24,3 @@ build-linux: artifacts: paths: - artifacts/* - -clang-format: - stage: format - image: suyuemu/cibuild:latest - resource_group: linux-ci - variables: - RELEASE_NAME: mainline - script: - - bash .ci/scripts/format/script.sh From 769aefe6677940554c0d1d7640e7649d110f7b4e Mon Sep 17 00:00:00 2001 From: niansa Date: Fri, 8 Mar 2024 19:31:15 +0000 Subject: [PATCH 4/6] Move clang-format out of resource group --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35155c50a6..62c872ae6e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,6 @@ stages: clang-format: stage: format image: suyuemu/cibuild:latest - resource_group: linux-ci variables: RELEASE_NAME: mainline script: From 539849b4d6089f9f280b4e464dd615cd015a4bb7 Mon Sep 17 00:00:00 2001 From: niansa Date: Fri, 8 Mar 2024 20:38:28 +0100 Subject: [PATCH 5/6] Fixed formatting --- src/suyu/about_dialog.cpp | 2 +- src/suyu/applets/qt_controller.cpp | 2 +- src/suyu/applets/qt_software_keyboard.cpp | 2 +- src/suyu/bootmanager.cpp | 6 +++--- src/suyu/breakpad.cpp | 4 ++-- src/suyu/compatdb.cpp | 2 +- src/suyu/configuration/configure_applets.cpp | 2 +- src/suyu/configuration/configure_audio.cpp | 2 +- src/suyu/configuration/configure_camera.cpp | 2 +- src/suyu/configuration/configure_cpu.cpp | 2 +- src/suyu/configuration/configure_cpu_debug.cpp | 2 +- src/suyu/configuration/configure_debug.cpp | 2 +- src/suyu/configuration/configure_debug_controller.cpp | 2 +- src/suyu/configuration/configure_debug_tab.cpp | 2 +- src/suyu/configuration/configure_dialog.cpp | 4 ++-- src/suyu/configuration/configure_filesystem.cpp | 2 +- src/suyu/configuration/configure_general.cpp | 2 +- src/suyu/configuration/configure_graphics.cpp | 2 +- src/suyu/configuration/configure_graphics.h | 2 +- src/suyu/configuration/configure_graphics_advanced.cpp | 2 +- src/suyu/configuration/configure_hotkeys.cpp | 2 +- src/suyu/configuration/configure_input.cpp | 6 +++--- src/suyu/configuration/configure_input_advanced.cpp | 2 +- src/suyu/configuration/configure_input_per_game.cpp | 2 +- src/suyu/configuration/configure_input_per_game.h | 2 +- src/suyu/configuration/configure_input_player.cpp | 2 +- .../configuration/configure_input_profile_dialog.cpp | 2 +- src/suyu/configuration/configure_linux_tab.cpp | 2 +- src/suyu/configuration/configure_motion_touch.cpp | 2 +- src/suyu/configuration/configure_mouse_panning.cpp | 2 +- src/suyu/configuration/configure_network.cpp | 2 +- src/suyu/configuration/configure_per_game.cpp | 2 +- src/suyu/configuration/configure_per_game.h | 2 +- src/suyu/configuration/configure_per_game_addons.cpp | 2 +- src/suyu/configuration/configure_profile_manager.cpp | 2 +- src/suyu/configuration/configure_ringcon.cpp | 2 +- src/suyu/configuration/configure_system.cpp | 2 +- src/suyu/configuration/configure_tas.cpp | 2 +- src/suyu/configuration/configure_touch_from_button.cpp | 2 +- .../configuration/configure_touchscreen_advanced.cpp | 2 +- src/suyu/configuration/configure_ui.cpp | 2 +- src/suyu/configuration/configure_vibration.cpp | 2 +- src/suyu/configuration/configure_web.cpp | 2 +- src/suyu/game_list.cpp | 1 - src/suyu/game_list.h | 3 +-- src/suyu/loading_screen.cpp | 2 +- src/suyu/main.cpp | 10 +++++----- src/suyu/multiplayer/chat_room.cpp | 2 +- src/suyu/multiplayer/client_room.cpp | 2 +- src/suyu/multiplayer/direct_connect.cpp | 2 +- src/suyu/multiplayer/host_room.cpp | 2 +- src/suyu/multiplayer/lobby.cpp | 2 +- src/suyu/multiplayer/moderation_dialog.cpp | 2 +- src/suyu/startup_checks.cpp | 2 +- src/suyu/util/overlay_dialog.cpp | 2 +- src/suyu/vk_device_info.cpp | 2 +- src/suyu_cmd/emu_window/emu_window_sdl2_gl.cpp | 2 +- src/suyu_cmd/emu_window/emu_window_sdl2_null.cpp | 2 +- src/suyu_cmd/emu_window/emu_window_sdl2_vk.cpp | 2 +- src/suyu_cmd/suyu.cpp | 2 +- 60 files changed, 69 insertions(+), 71 deletions(-) diff --git a/src/suyu/about_dialog.cpp b/src/suyu/about_dialog.cpp index 61df8e68d5..96d4cf95be 100644 --- a/src/suyu/about_dialog.cpp +++ b/src/suyu/about_dialog.cpp @@ -4,8 +4,8 @@ #include #include #include "common/scm_rev.h" -#include "ui_aboutdialog.h" #include "suyu/about_dialog.h" +#include "ui_aboutdialog.h" AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui{std::make_unique()} { diff --git a/src/suyu/applets/qt_controller.cpp b/src/suyu/applets/qt_controller.cpp index 74471473c4..b93b11fc9c 100644 --- a/src/suyu/applets/qt_controller.cpp +++ b/src/suyu/applets/qt_controller.cpp @@ -14,7 +14,6 @@ #include "hid_core/hid_core.h" #include "hid_core/hid_types.h" #include "hid_core/resources/npad/npad.h" -#include "ui_qt_controller.h" #include "suyu/applets/qt_controller.h" #include "suyu/configuration/configure_input.h" #include "suyu/configuration/configure_input_profile_dialog.h" @@ -23,6 +22,7 @@ #include "suyu/configuration/input_profiles.h" #include "suyu/main.h" #include "suyu/util/controller_navigation.h" +#include "ui_qt_controller.h" namespace { diff --git a/src/suyu/applets/qt_software_keyboard.cpp b/src/suyu/applets/qt_software_keyboard.cpp index f930394e38..3626aade49 100644 --- a/src/suyu/applets/qt_software_keyboard.cpp +++ b/src/suyu/applets/qt_software_keyboard.cpp @@ -13,10 +13,10 @@ #include "hid_core/frontend/input_interpreter.h" #include "hid_core/hid_core.h" #include "hid_core/hid_types.h" -#include "ui_qt_software_keyboard.h" #include "suyu/applets/qt_software_keyboard.h" #include "suyu/main.h" #include "suyu/util/overlay_dialog.h" +#include "ui_qt_software_keyboard.h" namespace { diff --git a/src/suyu/bootmanager.cpp b/src/suyu/bootmanager.cpp index caa90bd10f..76241f9947 100644 --- a/src/suyu/bootmanager.cpp +++ b/src/suyu/bootmanager.cpp @@ -54,12 +54,12 @@ #include "input_common/drivers/tas_input.h" #include "input_common/drivers/touch_screen.h" #include "input_common/main.h" -#include "video_core/gpu.h" -#include "video_core/rasterizer_interface.h" -#include "video_core/renderer_base.h" #include "suyu/bootmanager.h" #include "suyu/main.h" #include "suyu/qt_common.h" +#include "video_core/gpu.h" +#include "video_core/rasterizer_interface.h" +#include "video_core/renderer_base.h" class QObject; class QPaintEngine; diff --git a/src/suyu/breakpad.cpp b/src/suyu/breakpad.cpp index fb94b2d3fb..7895a84e0f 100644 --- a/src/suyu/breakpad.cpp +++ b/src/suyu/breakpad.cpp @@ -50,8 +50,8 @@ static void PruneDumpDirectory(const std::filesystem::path& dump_path) { } #if defined(__linux__) -[[noreturn]] static bool DumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* context, - bool succeeded) { +[[noreturn]] static bool DumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, + void* context, bool succeeded) { // Prevent time- and space-consuming core dumps from being generated, as we have // already generated a minidump and a core file will not be useful anyway. _exit(1); diff --git a/src/suyu/compatdb.cpp b/src/suyu/compatdb.cpp index 2759371cf5..8f63a4b555 100644 --- a/src/suyu/compatdb.cpp +++ b/src/suyu/compatdb.cpp @@ -8,8 +8,8 @@ #include "common/logging/log.h" #include "common/telemetry.h" #include "core/telemetry_session.h" -#include "ui_compatdb.h" #include "suyu/compatdb.h" +#include "ui_compatdb.h" CompatDB::CompatDB(Core::TelemetrySession& telemetry_session_, QWidget* parent) : QWizard(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint), diff --git a/src/suyu/configuration/configure_applets.cpp b/src/suyu/configuration/configure_applets.cpp index 93def59c06..a607fa3af8 100644 --- a/src/suyu/configuration/configure_applets.cpp +++ b/src/suyu/configuration/configure_applets.cpp @@ -3,10 +3,10 @@ #include "common/settings.h" #include "core/core.h" -#include "ui_configure_applets.h" #include "suyu/configuration/configuration_shared.h" #include "suyu/configuration/configure_applets.h" #include "suyu/configuration/shared_widget.h" +#include "ui_configure_applets.h" ConfigureApplets::ConfigureApplets(Core::System& system_, std::shared_ptr> group_, diff --git a/src/suyu/configuration/configure_audio.cpp b/src/suyu/configuration/configure_audio.cpp index b3ffca9c92..2341131585 100644 --- a/src/suyu/configuration/configure_audio.cpp +++ b/src/suyu/configuration/configure_audio.cpp @@ -13,12 +13,12 @@ #include "common/settings.h" #include "common/settings_common.h" #include "core/core.h" -#include "ui_configure_audio.h" #include "suyu/configuration/configuration_shared.h" #include "suyu/configuration/configure_audio.h" #include "suyu/configuration/shared_translation.h" #include "suyu/configuration/shared_widget.h" #include "suyu/uisettings.h" +#include "ui_configure_audio.h" ConfigureAudio::ConfigureAudio(const Core::System& system_, std::shared_ptr> group_, diff --git a/src/suyu/configuration/configure_camera.cpp b/src/suyu/configuration/configure_camera.cpp index 81d4d01665..cb23fd78b2 100644 --- a/src/suyu/configuration/configure_camera.cpp +++ b/src/suyu/configuration/configure_camera.cpp @@ -13,8 +13,8 @@ #include "common/settings.h" #include "input_common/drivers/camera.h" #include "input_common/main.h" -#include "ui_configure_camera.h" #include "suyu/configuration/configure_camera.h" +#include "ui_configure_camera.h" ConfigureCamera::ConfigureCamera(QWidget* parent, InputCommon::InputSubsystem* input_subsystem_) : QDialog(parent), input_subsystem{input_subsystem_}, diff --git a/src/suyu/configuration/configure_cpu.cpp b/src/suyu/configuration/configure_cpu.cpp index ac92c73fab..ce266642ff 100644 --- a/src/suyu/configuration/configure_cpu.cpp +++ b/src/suyu/configuration/configure_cpu.cpp @@ -10,9 +10,9 @@ #include "common/settings_enums.h" #include "configuration/shared_widget.h" #include "core/core.h" -#include "ui_configure_cpu.h" #include "suyu/configuration/configuration_shared.h" #include "suyu/configuration/configure_cpu.h" +#include "ui_configure_cpu.h" ConfigureCpu::ConfigureCpu(const Core::System& system_, std::shared_ptr> group_, diff --git a/src/suyu/configuration/configure_cpu_debug.cpp b/src/suyu/configuration/configure_cpu_debug.cpp index 26c5c74d15..4651b78e0f 100644 --- a/src/suyu/configuration/configure_cpu_debug.cpp +++ b/src/suyu/configuration/configure_cpu_debug.cpp @@ -3,8 +3,8 @@ #include "common/settings.h" #include "core/core.h" -#include "ui_configure_cpu_debug.h" #include "suyu/configuration/configure_cpu_debug.h" +#include "ui_configure_cpu_debug.h" ConfigureCpuDebug::ConfigureCpuDebug(const Core::System& system_, QWidget* parent) : QWidget(parent), ui{std::make_unique()}, system{system_} { diff --git a/src/suyu/configuration/configure_debug.cpp b/src/suyu/configuration/configure_debug.cpp index ec684acd46..e1ad00113f 100644 --- a/src/suyu/configuration/configure_debug.cpp +++ b/src/suyu/configuration/configure_debug.cpp @@ -9,10 +9,10 @@ #include "common/logging/filter.h" #include "common/settings.h" #include "core/core.h" -#include "ui_configure_debug.h" #include "suyu/configuration/configure_debug.h" #include "suyu/debugger/console.h" #include "suyu/uisettings.h" +#include "ui_configure_debug.h" ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent) : QScrollArea(parent), ui{std::make_unique()}, system{system_} { diff --git a/src/suyu/configuration/configure_debug_controller.cpp b/src/suyu/configuration/configure_debug_controller.cpp index 765cb00a34..cee6450852 100644 --- a/src/suyu/configuration/configure_debug_controller.cpp +++ b/src/suyu/configuration/configure_debug_controller.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "hid_core/hid_core.h" -#include "ui_configure_debug_controller.h" #include "suyu/configuration/configure_debug_controller.h" #include "suyu/configuration/configure_input_player.h" +#include "ui_configure_debug_controller.h" ConfigureDebugController::ConfigureDebugController(QWidget* parent, InputCommon::InputSubsystem* input_subsystem, diff --git a/src/suyu/configuration/configure_debug_tab.cpp b/src/suyu/configuration/configure_debug_tab.cpp index 5a564f20b4..e3f3e72ec5 100644 --- a/src/suyu/configuration/configure_debug_tab.cpp +++ b/src/suyu/configuration/configure_debug_tab.cpp @@ -2,10 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include "ui_configure_debug_tab.h" #include "suyu/configuration/configure_cpu_debug.h" #include "suyu/configuration/configure_debug.h" #include "suyu/configuration/configure_debug_tab.h" +#include "ui_configure_debug_tab.h" ConfigureDebugTab::ConfigureDebugTab(const Core::System& system_, QWidget* parent) : QWidget(parent), ui{std::make_unique()}, diff --git a/src/suyu/configuration/configure_dialog.cpp b/src/suyu/configuration/configure_dialog.cpp index 0307e8d1c0..0d6ac9ad82 100644 --- a/src/suyu/configuration/configure_dialog.cpp +++ b/src/suyu/configuration/configure_dialog.cpp @@ -6,8 +6,6 @@ #include "common/settings.h" #include "common/settings_enums.h" #include "core/core.h" -#include "ui_configure.h" -#include "vk_device_info.h" #include "suyu/configuration/configure_applets.h" #include "suyu/configuration/configure_audio.h" #include "suyu/configuration/configure_cpu.h" @@ -27,6 +25,8 @@ #include "suyu/configuration/configure_web.h" #include "suyu/hotkeys.h" #include "suyu/uisettings.h" +#include "ui_configure.h" +#include "vk_device_info.h" ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, InputCommon::InputSubsystem* input_subsystem, diff --git a/src/suyu/configuration/configure_filesystem.cpp b/src/suyu/configuration/configure_filesystem.cpp index b6b53b35cc..0686a4946a 100644 --- a/src/suyu/configuration/configure_filesystem.cpp +++ b/src/suyu/configuration/configure_filesystem.cpp @@ -6,9 +6,9 @@ #include "common/fs/fs.h" #include "common/fs/path_util.h" #include "common/settings.h" -#include "ui_configure_filesystem.h" #include "suyu/configuration/configure_filesystem.h" #include "suyu/uisettings.h" +#include "ui_configure_filesystem.h" ConfigureFilesystem::ConfigureFilesystem(QWidget* parent) : QWidget(parent), ui(std::make_unique()) { diff --git a/src/suyu/configuration/configure_general.cpp b/src/suyu/configuration/configure_general.cpp index bae13488e2..689d9be2b8 100644 --- a/src/suyu/configuration/configure_general.cpp +++ b/src/suyu/configuration/configure_general.cpp @@ -7,11 +7,11 @@ #include #include "common/settings.h" #include "core/core.h" -#include "ui_configure_general.h" #include "suyu/configuration/configuration_shared.h" #include "suyu/configuration/configure_general.h" #include "suyu/configuration/shared_widget.h" #include "suyu/uisettings.h" +#include "ui_configure_general.h" ConfigureGeneral::ConfigureGeneral(const Core::System& system_, std::shared_ptr> group_, diff --git a/src/suyu/configuration/configure_graphics.cpp b/src/suyu/configuration/configure_graphics.cpp index 26173be817..d11110a74a 100644 --- a/src/suyu/configuration/configure_graphics.cpp +++ b/src/suyu/configuration/configure_graphics.cpp @@ -36,13 +36,13 @@ #include "common/settings.h" #include "common/settings_enums.h" #include "core/core.h" -#include "ui_configure_graphics.h" #include "suyu/configuration/configuration_shared.h" #include "suyu/configuration/configure_graphics.h" #include "suyu/configuration/shared_widget.h" #include "suyu/qt_common.h" #include "suyu/uisettings.h" #include "suyu/vk_device_info.h" +#include "ui_configure_graphics.h" static const std::vector default_present_modes{VK_PRESENT_MODE_IMMEDIATE_KHR, VK_PRESENT_MODE_FIFO_KHR}; diff --git a/src/suyu/configuration/configure_graphics.h b/src/suyu/configuration/configure_graphics.h index 416e74c840..2a9b87d32b 100644 --- a/src/suyu/configuration/configure_graphics.h +++ b/src/suyu/configuration/configure_graphics.h @@ -16,8 +16,8 @@ #include "common/common_types.h" #include "common/settings_enums.h" #include "configuration/shared_translation.h" -#include "vk_device_info.h" #include "suyu/configuration/configuration_shared.h" +#include "vk_device_info.h" class QPushButton; class QEvent; diff --git a/src/suyu/configuration/configure_graphics_advanced.cpp b/src/suyu/configuration/configure_graphics_advanced.cpp index a16e891329..8cdae0a65d 100644 --- a/src/suyu/configuration/configure_graphics_advanced.cpp +++ b/src/suyu/configuration/configure_graphics_advanced.cpp @@ -6,11 +6,11 @@ #include #include "common/settings.h" #include "core/core.h" -#include "ui_configure_graphics_advanced.h" #include "suyu/configuration/configuration_shared.h" #include "suyu/configuration/configure_graphics_advanced.h" #include "suyu/configuration/shared_translation.h" #include "suyu/configuration/shared_widget.h" +#include "ui_configure_graphics_advanced.h" ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced( const Core::System& system_, std::shared_ptr> group_, diff --git a/src/suyu/configuration/configure_hotkeys.cpp b/src/suyu/configuration/configure_hotkeys.cpp index e32f756aa0..02bc34af33 100644 --- a/src/suyu/configuration/configure_hotkeys.cpp +++ b/src/suyu/configuration/configure_hotkeys.cpp @@ -10,11 +10,11 @@ #include "hid_core/hid_core.h" #include "frontend_common/config.h" -#include "ui_configure_hotkeys.h" #include "suyu/configuration/configure_hotkeys.h" #include "suyu/hotkeys.h" #include "suyu/uisettings.h" #include "suyu/util/sequence_dialog/sequence_dialog.h" +#include "ui_configure_hotkeys.h" constexpr int name_column = 0; constexpr int hotkey_column = 1; diff --git a/src/suyu/configuration/configure_input.cpp b/src/suyu/configuration/configure_input.cpp index ddb9c8514b..edc2e96d75 100644 --- a/src/suyu/configuration/configure_input.cpp +++ b/src/suyu/configuration/configure_input.cpp @@ -12,9 +12,6 @@ #include "core/hle/service/sm/sm.h" #include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_core.h" -#include "ui_configure_input.h" -#include "ui_configure_input_advanced.h" -#include "ui_configure_input_player.h" #include "suyu/configuration/configure_camera.h" #include "suyu/configuration/configure_debug_controller.h" #include "suyu/configuration/configure_input.h" @@ -25,6 +22,9 @@ #include "suyu/configuration/configure_touchscreen_advanced.h" #include "suyu/configuration/configure_vibration.h" #include "suyu/configuration/input_profiles.h" +#include "ui_configure_input.h" +#include "ui_configure_input_advanced.h" +#include "ui_configure_input_player.h" namespace { template diff --git a/src/suyu/configuration/configure_input_advanced.cpp b/src/suyu/configuration/configure_input_advanced.cpp index 0534920679..dd4ed0e03c 100644 --- a/src/suyu/configuration/configure_input_advanced.cpp +++ b/src/suyu/configuration/configure_input_advanced.cpp @@ -6,8 +6,8 @@ #include "core/core.h" #include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_core.h" -#include "ui_configure_input_advanced.h" #include "suyu/configuration/configure_input_advanced.h" +#include "ui_configure_input_advanced.h" ConfigureInputAdvanced::ConfigureInputAdvanced(Core::HID::HIDCore& hid_core_, QWidget* parent) : QWidget(parent), ui(std::make_unique()), hid_core{hid_core_} { diff --git a/src/suyu/configuration/configure_input_per_game.cpp b/src/suyu/configuration/configure_input_per_game.cpp index 616d336c58..17697008f7 100644 --- a/src/suyu/configuration/configure_input_per_game.cpp +++ b/src/suyu/configuration/configure_input_per_game.cpp @@ -6,9 +6,9 @@ #include "frontend_common/config.h" #include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_core.h" -#include "ui_configure_input_per_game.h" #include "suyu/configuration/configure_input_per_game.h" #include "suyu/configuration/input_profiles.h" +#include "ui_configure_input_per_game.h" ConfigureInputPerGame::ConfigureInputPerGame(Core::System& system_, QtConfig* config_, QWidget* parent) diff --git a/src/suyu/configuration/configure_input_per_game.h b/src/suyu/configuration/configure_input_per_game.h index c4ef8fa19e..e8e9688dbb 100644 --- a/src/suyu/configuration/configure_input_per_game.h +++ b/src/suyu/configuration/configure_input_per_game.h @@ -7,9 +7,9 @@ #include -#include "ui_configure_input_per_game.h" #include "suyu/configuration/input_profiles.h" #include "suyu/configuration/qt_config.h" +#include "ui_configure_input_per_game.h" class QComboBox; diff --git a/src/suyu/configuration/configure_input_player.cpp b/src/suyu/configuration/configure_input_player.cpp index a23d4550b4..1fd176e987 100644 --- a/src/suyu/configuration/configure_input_player.cpp +++ b/src/suyu/configuration/configure_input_player.cpp @@ -20,13 +20,13 @@ #include "input_common/drivers/keyboard.h" #include "input_common/drivers/mouse.h" #include "input_common/main.h" -#include "ui_configure_input_player.h" #include "suyu/bootmanager.h" #include "suyu/configuration/configure_input_player.h" #include "suyu/configuration/configure_input_player_widget.h" #include "suyu/configuration/configure_mouse_panning.h" #include "suyu/configuration/input_profiles.h" #include "suyu/util/limitable_input_dialog.h" +#include "ui_configure_input_player.h" const std::array ConfigureInputPlayer::analog_sub_buttons{{ diff --git a/src/suyu/configuration/configure_input_profile_dialog.cpp b/src/suyu/configuration/configure_input_profile_dialog.cpp index c68b802ebb..4b960d33a8 100644 --- a/src/suyu/configuration/configure_input_profile_dialog.cpp +++ b/src/suyu/configuration/configure_input_profile_dialog.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "core/core.h" -#include "ui_configure_input_profile_dialog.h" #include "suyu/configuration/configure_input_player.h" #include "suyu/configuration/configure_input_profile_dialog.h" +#include "ui_configure_input_profile_dialog.h" ConfigureInputProfileDialog::ConfigureInputProfileDialog( QWidget* parent, InputCommon::InputSubsystem* input_subsystem, InputProfiles* profiles, diff --git a/src/suyu/configuration/configure_linux_tab.cpp b/src/suyu/configuration/configure_linux_tab.cpp index f140af11e2..1db9893b71 100644 --- a/src/suyu/configuration/configure_linux_tab.cpp +++ b/src/suyu/configuration/configure_linux_tab.cpp @@ -3,10 +3,10 @@ #include "common/settings.h" #include "core/core.h" -#include "ui_configure_linux_tab.h" #include "suyu/configuration/configuration_shared.h" #include "suyu/configuration/configure_linux_tab.h" #include "suyu/configuration/shared_widget.h" +#include "ui_configure_linux_tab.h" ConfigureLinuxTab::ConfigureLinuxTab(const Core::System& system_, std::shared_ptr> group_, diff --git a/src/suyu/configuration/configure_motion_touch.cpp b/src/suyu/configuration/configure_motion_touch.cpp index 9310eb6ad5..b68871a5d7 100644 --- a/src/suyu/configuration/configure_motion_touch.cpp +++ b/src/suyu/configuration/configure_motion_touch.cpp @@ -12,9 +12,9 @@ #include "input_common/drivers/udp_client.h" #include "input_common/helpers/udp_protocol.h" #include "input_common/main.h" -#include "ui_configure_motion_touch.h" #include "suyu/configuration/configure_motion_touch.h" #include "suyu/configuration/configure_touch_from_button.h" +#include "ui_configure_motion_touch.h" CalibrationConfigurationDialog::CalibrationConfigurationDialog(QWidget* parent, const std::string& host, u16 port) diff --git a/src/suyu/configuration/configure_mouse_panning.cpp b/src/suyu/configuration/configure_mouse_panning.cpp index 43c1cec692..5763e5a5e2 100644 --- a/src/suyu/configuration/configure_mouse_panning.cpp +++ b/src/suyu/configuration/configure_mouse_panning.cpp @@ -5,8 +5,8 @@ #include #include "common/settings.h" -#include "ui_configure_mouse_panning.h" #include "suyu/configuration/configure_mouse_panning.h" +#include "ui_configure_mouse_panning.h" ConfigureMousePanning::ConfigureMousePanning(QWidget* parent, InputCommon::InputSubsystem* input_subsystem_, diff --git a/src/suyu/configuration/configure_network.cpp b/src/suyu/configuration/configure_network.cpp index a2da7e8a5c..265efa76a3 100644 --- a/src/suyu/configuration/configure_network.cpp +++ b/src/suyu/configuration/configure_network.cpp @@ -5,8 +5,8 @@ #include "common/settings.h" #include "core/core.h" #include "core/internal_network/network_interface.h" -#include "ui_configure_network.h" #include "suyu/configuration/configure_network.h" +#include "ui_configure_network.h" ConfigureNetwork::ConfigureNetwork(const Core::System& system_, QWidget* parent) : QWidget(parent), ui(std::make_unique()), system{system_} { diff --git a/src/suyu/configuration/configure_per_game.cpp b/src/suyu/configuration/configure_per_game.cpp index 2680cc6055..2cadba72ff 100644 --- a/src/suyu/configuration/configure_per_game.cpp +++ b/src/suyu/configuration/configure_per_game.cpp @@ -26,7 +26,6 @@ #include "core/file_sys/xts_archive.h" #include "core/loader/loader.h" #include "frontend_common/config.h" -#include "ui_configure_per_game.h" #include "suyu/configuration/configuration_shared.h" #include "suyu/configuration/configure_audio.h" #include "suyu/configuration/configure_cpu.h" @@ -40,6 +39,7 @@ #include "suyu/uisettings.h" #include "suyu/util/util.h" #include "suyu/vk_device_info.h" +#include "ui_configure_per_game.h" ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::string& file_name, std::vector& vk_device_records, diff --git a/src/suyu/configuration/configure_per_game.h b/src/suyu/configuration/configure_per_game.h index c164036e83..3fa03b1d88 100644 --- a/src/suyu/configuration/configure_per_game.h +++ b/src/suyu/configuration/configure_per_game.h @@ -13,10 +13,10 @@ #include "configuration/shared_widget.h" #include "core/file_sys/vfs/vfs_types.h" #include "frontend_common/config.h" -#include "vk_device_info.h" #include "suyu/configuration/configuration_shared.h" #include "suyu/configuration/qt_config.h" #include "suyu/configuration/shared_translation.h" +#include "vk_device_info.h" namespace Core { class System; diff --git a/src/suyu/configuration/configure_per_game_addons.cpp b/src/suyu/configuration/configure_per_game_addons.cpp index 65ad93d0da..79f2cd2c6a 100644 --- a/src/suyu/configuration/configure_per_game_addons.cpp +++ b/src/suyu/configuration/configure_per_game_addons.cpp @@ -18,10 +18,10 @@ #include "core/file_sys/patch_manager.h" #include "core/file_sys/xts_archive.h" #include "core/loader/loader.h" -#include "ui_configure_per_game_addons.h" #include "suyu/configuration/configure_input.h" #include "suyu/configuration/configure_per_game_addons.h" #include "suyu/uisettings.h" +#include "ui_configure_per_game_addons.h" ConfigurePerGameAddons::ConfigurePerGameAddons(Core::System& system_, QWidget* parent) : QWidget(parent), ui{std::make_unique()}, system{system_} { diff --git a/src/suyu/configuration/configure_profile_manager.cpp b/src/suyu/configuration/configure_profile_manager.cpp index 159a1e96d1..16b5fe4285 100644 --- a/src/suyu/configuration/configure_profile_manager.cpp +++ b/src/suyu/configuration/configure_profile_manager.cpp @@ -17,9 +17,9 @@ #include "common/string_util.h" #include "core/core.h" #include "core/hle/service/acc/profile_manager.h" -#include "ui_configure_profile_manager.h" #include "suyu/configuration/configure_profile_manager.h" #include "suyu/util/limitable_input_dialog.h" +#include "ui_configure_profile_manager.h" namespace { // Same backup JPEG used by acc IProfile::GetImage if no jpeg found diff --git a/src/suyu/configuration/configure_ringcon.cpp b/src/suyu/configuration/configure_ringcon.cpp index fa716accf7..8e19a22241 100644 --- a/src/suyu/configuration/configure_ringcon.cpp +++ b/src/suyu/configuration/configure_ringcon.cpp @@ -14,9 +14,9 @@ #include "input_common/drivers/keyboard.h" #include "input_common/drivers/mouse.h" #include "input_common/main.h" -#include "ui_configure_ringcon.h" #include "suyu/bootmanager.h" #include "suyu/configuration/configure_ringcon.h" +#include "ui_configure_ringcon.h" const std::array ConfigureRingController::analog_sub_buttons{{ diff --git a/src/suyu/configuration/configure_system.cpp b/src/suyu/configuration/configure_system.cpp index eda791aaf1..3204303e98 100644 --- a/src/suyu/configuration/configure_system.cpp +++ b/src/suyu/configuration/configure_system.cpp @@ -16,10 +16,10 @@ #include "common/settings.h" #include "core/core.h" -#include "ui_configure_system.h" #include "suyu/configuration/configuration_shared.h" #include "suyu/configuration/configure_system.h" #include "suyu/configuration/shared_widget.h" +#include "ui_configure_system.h" constexpr std::array LOCALE_BLOCKLIST{ // pzzefezrpnkzeidfej diff --git a/src/suyu/configuration/configure_tas.cpp b/src/suyu/configuration/configure_tas.cpp index 318b0d25c7..5f967b88cc 100644 --- a/src/suyu/configuration/configure_tas.cpp +++ b/src/suyu/configuration/configure_tas.cpp @@ -6,9 +6,9 @@ #include "common/fs/fs.h" #include "common/fs/path_util.h" #include "common/settings.h" -#include "ui_configure_tas.h" #include "suyu/configuration/configure_tas.h" #include "suyu/uisettings.h" +#include "ui_configure_tas.h" ConfigureTasDialog::ConfigureTasDialog(QWidget* parent) : QDialog(parent), ui(std::make_unique()) { diff --git a/src/suyu/configuration/configure_touch_from_button.cpp b/src/suyu/configuration/configure_touch_from_button.cpp index 81e25c68c2..da57f426a4 100644 --- a/src/suyu/configuration/configure_touch_from_button.cpp +++ b/src/suyu/configuration/configure_touch_from_button.cpp @@ -11,9 +11,9 @@ #include "common/settings.h" #include "core/frontend/framebuffer_layout.h" #include "input_common/main.h" -#include "ui_configure_touch_from_button.h" #include "suyu/configuration/configure_touch_from_button.h" #include "suyu/configuration/configure_touch_widget.h" +#include "ui_configure_touch_from_button.h" static QString GetKeyName(int key_code) { switch (key_code) { diff --git a/src/suyu/configuration/configure_touchscreen_advanced.cpp b/src/suyu/configuration/configure_touchscreen_advanced.cpp index fd20653f06..66925a85c2 100644 --- a/src/suyu/configuration/configure_touchscreen_advanced.cpp +++ b/src/suyu/configuration/configure_touchscreen_advanced.cpp @@ -3,8 +3,8 @@ #include #include "common/settings.h" -#include "ui_configure_touchscreen_advanced.h" #include "suyu/configuration/configure_touchscreen_advanced.h" +#include "ui_configure_touchscreen_advanced.h" ConfigureTouchscreenAdvanced::ConfigureTouchscreenAdvanced(QWidget* parent) : QDialog(parent), ui(std::make_unique()) { diff --git a/src/suyu/configuration/configure_ui.cpp b/src/suyu/configuration/configure_ui.cpp index 2d9f5cde97..408a7372a7 100644 --- a/src/suyu/configuration/configure_ui.cpp +++ b/src/suyu/configuration/configure_ui.cpp @@ -26,8 +26,8 @@ #include "common/settings_enums.h" #include "core/core.h" #include "core/frontend/framebuffer_layout.h" -#include "ui_configure_ui.h" #include "suyu/uisettings.h" +#include "ui_configure_ui.h" namespace { constexpr std::array default_game_icon_sizes{ diff --git a/src/suyu/configuration/configure_vibration.cpp b/src/suyu/configuration/configure_vibration.cpp index f12b835458..6fa197d89b 100644 --- a/src/suyu/configuration/configure_vibration.cpp +++ b/src/suyu/configuration/configure_vibration.cpp @@ -5,8 +5,8 @@ #include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_core.h" #include "hid_core/hid_types.h" -#include "ui_configure_vibration.h" #include "suyu/configuration/configure_vibration.h" +#include "ui_configure_vibration.h" ConfigureVibration::ConfigureVibration(QWidget* parent, Core::HID::HIDCore& hid_core_) : QDialog(parent), ui(std::make_unique()), hid_core{hid_core_} { diff --git a/src/suyu/configuration/configure_web.cpp b/src/suyu/configuration/configure_web.cpp index af8c8e4662..196f5001cf 100644 --- a/src/suyu/configuration/configure_web.cpp +++ b/src/suyu/configuration/configure_web.cpp @@ -6,9 +6,9 @@ #include #include "common/settings.h" #include "core/telemetry_session.h" -#include "ui_configure_web.h" #include "suyu/configuration/configure_web.h" #include "suyu/uisettings.h" +#include "ui_configure_web.h" static constexpr char token_delimiter{':'}; diff --git a/src/suyu/game_list.cpp b/src/suyu/game_list.cpp index feff438ad1..478838bc84 100644 --- a/src/suyu/game_list.cpp +++ b/src/suyu/game_list.cpp @@ -3,7 +3,6 @@ // Modified by palfaiate on <2024/03/07> - #include #include #include diff --git a/src/suyu/game_list.h b/src/suyu/game_list.h index ae72bdd7c7..f8796fa821 100644 --- a/src/suyu/game_list.h +++ b/src/suyu/game_list.h @@ -3,7 +3,6 @@ // Modified by palfaiate on <2024/03/07> - #pragma once #include @@ -19,9 +18,9 @@ #include "common/common_types.h" #include "core/core.h" -#include "uisettings.h" #include "suyu/compatibility_list.h" #include "suyu/play_time_manager.h" +#include "uisettings.h" namespace Core { class System; diff --git a/src/suyu/loading_screen.cpp b/src/suyu/loading_screen.cpp index eef8d5e198..64f3264bec 100644 --- a/src/suyu/loading_screen.cpp +++ b/src/suyu/loading_screen.cpp @@ -13,9 +13,9 @@ #include #include "core/frontend/framebuffer_layout.h" #include "core/loader/loader.h" +#include "suyu/loading_screen.h" #include "ui_loading_screen.h" #include "video_core/rasterizer_interface.h" -#include "suyu/loading_screen.h" // Mingw seems to not have QMovie at all. If QMovie is missing then use a single frame instead of an // showing the full animation diff --git a/src/suyu/main.cpp b/src/suyu/main.cpp index 7bc30c73b3..ede59bda12 100644 --- a/src/suyu/main.cpp +++ b/src/suyu/main.cpp @@ -124,11 +124,6 @@ #include "input_common/drivers/tas_input.h" #include "input_common/drivers/virtual_amiibo.h" #include "input_common/main.h" -#include "ui_main.h" -#include "util/overlay_dialog.h" -#include "video_core/gpu.h" -#include "video_core/renderer_base.h" -#include "video_core/shader_notify.h" #include "suyu/about_dialog.h" #include "suyu/bootmanager.h" #include "suyu/compatdb.h" @@ -152,6 +147,11 @@ #include "suyu/uisettings.h" #include "suyu/util/clickable_label.h" #include "suyu/vk_device_info.h" +#include "ui_main.h" +#include "util/overlay_dialog.h" +#include "video_core/gpu.h" +#include "video_core/renderer_base.h" +#include "video_core/shader_notify.h" #ifdef SUYU_CRASH_DUMPS #include "suyu/breakpad.h" diff --git a/src/suyu/multiplayer/chat_room.cpp b/src/suyu/multiplayer/chat_room.cpp index a4f6c70f59..2863971f42 100644 --- a/src/suyu/multiplayer/chat_room.cpp +++ b/src/suyu/multiplayer/chat_room.cpp @@ -17,10 +17,10 @@ #include #include "common/logging/log.h" #include "network/announce_multiplayer_session.h" -#include "ui_chat_room.h" #include "suyu/game_list_p.h" #include "suyu/multiplayer/chat_room.h" #include "suyu/multiplayer/message.h" +#include "ui_chat_room.h" #ifdef ENABLE_WEB_SERVICE #include "web_service/web_backend.h" #endif diff --git a/src/suyu/multiplayer/client_room.cpp b/src/suyu/multiplayer/client_room.cpp index 6f67b15b2d..eebd29d9b5 100644 --- a/src/suyu/multiplayer/client_room.cpp +++ b/src/suyu/multiplayer/client_room.cpp @@ -11,12 +11,12 @@ #include #include "common/logging/log.h" #include "network/announce_multiplayer_session.h" -#include "ui_client_room.h" #include "suyu/game_list_p.h" #include "suyu/multiplayer/client_room.h" #include "suyu/multiplayer/message.h" #include "suyu/multiplayer/moderation_dialog.h" #include "suyu/multiplayer/state.h" +#include "ui_client_room.h" ClientRoomWindow::ClientRoomWindow(QWidget* parent, Network::RoomNetwork& room_network_) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint), diff --git a/src/suyu/multiplayer/direct_connect.cpp b/src/suyu/multiplayer/direct_connect.cpp index 71733bbbc6..5d5cb7aabc 100644 --- a/src/suyu/multiplayer/direct_connect.cpp +++ b/src/suyu/multiplayer/direct_connect.cpp @@ -11,7 +11,6 @@ #include "core/core.h" #include "core/internal_network/network_interface.h" #include "network/network.h" -#include "ui_direct_connect.h" #include "suyu/main.h" #include "suyu/multiplayer/client_room.h" #include "suyu/multiplayer/direct_connect.h" @@ -19,6 +18,7 @@ #include "suyu/multiplayer/state.h" #include "suyu/multiplayer/validation.h" #include "suyu/uisettings.h" +#include "ui_direct_connect.h" enum class ConnectionType : u8 { TraversalServer, IP }; diff --git a/src/suyu/multiplayer/host_room.cpp b/src/suyu/multiplayer/host_room.cpp index e3e79386e5..6c71454c8e 100644 --- a/src/suyu/multiplayer/host_room.cpp +++ b/src/suyu/multiplayer/host_room.cpp @@ -15,7 +15,6 @@ #include "core/core.h" #include "core/internal_network/network_interface.h" #include "network/announce_multiplayer_session.h" -#include "ui_host_room.h" #include "suyu/game_list_p.h" #include "suyu/main.h" #include "suyu/multiplayer/host_room.h" @@ -23,6 +22,7 @@ #include "suyu/multiplayer/state.h" #include "suyu/multiplayer/validation.h" #include "suyu/uisettings.h" +#include "ui_host_room.h" #ifdef ENABLE_WEB_SERVICE #include "web_service/verify_user_jwt.h" #endif diff --git a/src/suyu/multiplayer/lobby.cpp b/src/suyu/multiplayer/lobby.cpp index 18bfb653ad..b4c0596632 100644 --- a/src/suyu/multiplayer/lobby.cpp +++ b/src/suyu/multiplayer/lobby.cpp @@ -10,7 +10,6 @@ #include "core/hle/service/acc/profile_manager.h" #include "core/internal_network/network_interface.h" #include "network/network.h" -#include "ui_lobby.h" #include "suyu/game_list_p.h" #include "suyu/main.h" #include "suyu/multiplayer/client_room.h" @@ -20,6 +19,7 @@ #include "suyu/multiplayer/state.h" #include "suyu/multiplayer/validation.h" #include "suyu/uisettings.h" +#include "ui_lobby.h" #ifdef ENABLE_WEB_SERVICE #include "web_service/web_backend.h" #endif diff --git a/src/suyu/multiplayer/moderation_dialog.cpp b/src/suyu/multiplayer/moderation_dialog.cpp index 8b40b9cfae..9650bb26ba 100644 --- a/src/suyu/multiplayer/moderation_dialog.cpp +++ b/src/suyu/multiplayer/moderation_dialog.cpp @@ -5,8 +5,8 @@ #include #include "network/network.h" #include "network/room_member.h" -#include "ui_moderation_dialog.h" #include "suyu/multiplayer/moderation_dialog.h" +#include "ui_moderation_dialog.h" namespace Column { enum { diff --git a/src/suyu/startup_checks.cpp b/src/suyu/startup_checks.cpp index 0c4ba8f041..f7308e0677 100644 --- a/src/suyu/startup_checks.cpp +++ b/src/suyu/startup_checks.cpp @@ -17,9 +17,9 @@ #endif #include +#include "suyu/startup_checks.h" #include "video_core/vulkan_common/vulkan_instance.h" #include "video_core/vulkan_common/vulkan_library.h" -#include "suyu/startup_checks.h" void CheckVulkan() { // Just start the Vulkan loader, this will crash if something is wrong diff --git a/src/suyu/util/overlay_dialog.cpp b/src/suyu/util/overlay_dialog.cpp index a687c15454..3a6245ec78 100644 --- a/src/suyu/util/overlay_dialog.cpp +++ b/src/suyu/util/overlay_dialog.cpp @@ -8,8 +8,8 @@ #include "core/core.h" #include "hid_core/frontend/input_interpreter.h" #include "hid_core/hid_types.h" -#include "ui_overlay_dialog.h" #include "suyu/util/overlay_dialog.h" +#include "ui_overlay_dialog.h" namespace { diff --git a/src/suyu/vk_device_info.cpp b/src/suyu/vk_device_info.cpp index 68a9270ac4..fe10c85e92 100644 --- a/src/suyu/vk_device_info.cpp +++ b/src/suyu/vk_device_info.cpp @@ -8,13 +8,13 @@ #include "common/dynamic_library.h" #include "common/logging/log.h" +#include "suyu/vk_device_info.h" #include "video_core/vulkan_common/vulkan_device.h" #include "video_core/vulkan_common/vulkan_instance.h" #include "video_core/vulkan_common/vulkan_library.h" #include "video_core/vulkan_common/vulkan_surface.h" #include "video_core/vulkan_common/vulkan_wrapper.h" #include "vulkan/vulkan_core.h" -#include "suyu/vk_device_info.h" class QWindow; diff --git a/src/suyu_cmd/emu_window/emu_window_sdl2_gl.cpp b/src/suyu_cmd/emu_window/emu_window_sdl2_gl.cpp index 87fdc1a7c8..92380538b5 100644 --- a/src/suyu_cmd/emu_window/emu_window_sdl2_gl.cpp +++ b/src/suyu_cmd/emu_window/emu_window_sdl2_gl.cpp @@ -16,8 +16,8 @@ #include "common/string_util.h" #include "core/core.h" #include "input_common/main.h" -#include "video_core/renderer_base.h" #include "suyu_cmd/emu_window/emu_window_sdl2_gl.h" +#include "video_core/renderer_base.h" class SDLGLContext : public Core::Frontend::GraphicsContext { public: diff --git a/src/suyu_cmd/emu_window/emu_window_sdl2_null.cpp b/src/suyu_cmd/emu_window/emu_window_sdl2_null.cpp index 18c3798010..1f7924dc46 100644 --- a/src/suyu_cmd/emu_window/emu_window_sdl2_null.cpp +++ b/src/suyu_cmd/emu_window/emu_window_sdl2_null.cpp @@ -9,8 +9,8 @@ #include "common/logging/log.h" #include "common/scm_rev.h" -#include "video_core/renderer_null/renderer_null.h" #include "suyu_cmd/emu_window/emu_window_sdl2_null.h" +#include "video_core/renderer_null/renderer_null.h" #ifdef SUYU_USE_EXTERNAL_SDL2 // Include this before SDL.h to prevent the external from including a dummy diff --git a/src/suyu_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/suyu_cmd/emu_window/emu_window_sdl2_vk.cpp index 59606831fb..5e6cac5f5e 100644 --- a/src/suyu_cmd/emu_window/emu_window_sdl2_vk.cpp +++ b/src/suyu_cmd/emu_window/emu_window_sdl2_vk.cpp @@ -9,8 +9,8 @@ #include "common/logging/log.h" #include "common/scm_rev.h" -#include "video_core/renderer_vulkan/renderer_vulkan.h" #include "suyu_cmd/emu_window/emu_window_sdl2_vk.h" +#include "video_core/renderer_vulkan/renderer_vulkan.h" #include #include diff --git a/src/suyu_cmd/suyu.cpp b/src/suyu_cmd/suyu.cpp index bebe1a07df..c50a3976b9 100644 --- a/src/suyu_cmd/suyu.cpp +++ b/src/suyu_cmd/suyu.cpp @@ -34,11 +34,11 @@ #include "input_common/main.h" #include "network/network.h" #include "sdl_config.h" -#include "video_core/renderer_base.h" #include "suyu_cmd/emu_window/emu_window_sdl2.h" #include "suyu_cmd/emu_window/emu_window_sdl2_gl.h" #include "suyu_cmd/emu_window/emu_window_sdl2_null.h" #include "suyu_cmd/emu_window/emu_window_sdl2_vk.h" +#include "video_core/renderer_base.h" #ifdef _WIN32 // windows.h needs to be included before shellapi.h From 774b4cd46685ae19f95f94f07ad9c2093cea6547 Mon Sep 17 00:00:00 2001 From: niansa Date: Fri, 8 Mar 2024 20:47:06 +0100 Subject: [PATCH 6/6] Fixed compile error --- src/suyu/configuration/configure_audio.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/suyu/configuration/configure_audio.h b/src/suyu/configuration/configure_audio.h index 74fa2fd620..640a758972 100644 --- a/src/suyu/configuration/configure_audio.h +++ b/src/suyu/configuration/configure_audio.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "suyu/configuration/configuration_shared.h"