From 4a36e969cea5d6e0585f9deb65777c3e3f09c82e Mon Sep 17 00:00:00 2001 From: merry Date: Sat, 3 Dec 2022 18:21:20 +0000 Subject: [PATCH] Update SDL2 include path --- src/audio_core/sink/sdl2_sink.cpp | 2 +- src/input_common/drivers/sdl_driver.h | 2 +- src/yuzu/main.cpp | 2 +- src/yuzu_cmd/config.cpp | 2 +- src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 2 +- src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp | 2 +- src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/audio_core/sink/sdl2_sink.cpp b/src/audio_core/sink/sdl2_sink.cpp index c138dc628e..275c093953 100644 --- a/src/audio_core/sink/sdl2_sink.cpp +++ b/src/audio_core/sink/sdl2_sink.cpp @@ -15,7 +15,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wimplicit-fallthrough" #endif -#include +#include #ifdef __clang__ #pragma clang diagnostic pop #endif diff --git a/src/input_common/drivers/sdl_driver.h b/src/input_common/drivers/sdl_driver.h index 366bcc4965..41e0aaf259 100644 --- a/src/input_common/drivers/sdl_driver.h +++ b/src/input_common/drivers/sdl_driver.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include "common/common_types.h" #include "common/threadsafe_queue.h" diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 4f693b3396..5081579e42 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -75,7 +75,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual #include #ifdef HAVE_SDL2 -#include // For SDL ScreenSaver functions +#include // For SDL ScreenSaver functions #endif #include diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 59f9c8e094..371d4575d9 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -10,7 +10,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wimplicit-fallthrough" #endif -#include +#include #ifdef __clang__ #pragma clang diagnostic pop #endif diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index 37dd1747c1..54b97b7833 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2016 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include "common/logging/log.h" #include "common/scm_rev.h" diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp index 9b660c13ce..a7e883339e 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp @@ -6,7 +6,7 @@ #include #define SDL_MAIN_HANDLED -#include +#include #include #include diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp index 0d580fe4fc..debeb87de1 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp @@ -13,13 +13,13 @@ #include "yuzu_cmd/emu_window/emu_window_sdl2_vk.h" #ifdef YUZU_USE_EXTERNAL_SDL2 -// Include this before SDL.h to prevent the external from including a dummy +// Include this before SDL2/SDL.h to prevent the external from including a dummy #define USING_GENERATED_CONFIG_H -#include +#include #endif -#include -#include +#include +#include EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsystem_, Core::System& system_, bool fullscreen)