Compare commits

...

2 Commits

Author SHA1 Message Date
merry
e737558056 externals: Update SDL to 5650046f9 2022-12-03 18:29:03 +00:00
merry
4a36e969ce Update SDL2 include path 2022-12-03 18:21:20 +00:00
8 changed files with 11 additions and 11 deletions

2
externals/SDL vendored

View File

@@ -15,7 +15,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
#endif
#include <SDL.h>
#include <SDL2/SDL.h>
#ifdef __clang__
#pragma clang diagnostic pop
#endif

View File

@@ -8,7 +8,7 @@
#include <thread>
#include <unordered_map>
#include <SDL.h>
#include <SDL2/SDL.h>
#include "common/common_types.h"
#include "common/threadsafe_queue.h"

View File

@@ -75,7 +75,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual
#include <QtConcurrent/QtConcurrent>
#ifdef HAVE_SDL2
#include <SDL.h> // For SDL ScreenSaver functions
#include <SDL2/SDL.h> // For SDL ScreenSaver functions
#endif
#include <fmt/format.h>

View File

@@ -10,7 +10,7 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
#endif
#include <SDL.h>
#include <SDL2/SDL.h>
#ifdef __clang__
#pragma clang diagnostic pop
#endif

View File

@@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2016 Citra Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include <SDL.h>
#include <SDL2/SDL.h>
#include "common/logging/log.h"
#include "common/scm_rev.h"

View File

@@ -6,7 +6,7 @@
#include <string>
#define SDL_MAIN_HANDLED
#include <SDL.h>
#include <SDL2/SDL.h>
#include <fmt/format.h>
#include <glad/glad.h>

View File

@@ -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 <SDL_config.h>
#include <SDL2/SDL_config.h>
#endif
#include <SDL.h>
#include <SDL_syswm.h>
#include <SDL2/SDL.h>
#include <SDL2/SDL_syswm.h>
EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsystem_,
Core::System& system_, bool fullscreen)