JPikachu/eden
1
0
Fork 0
forked from eden-emu/eden
Code Pull requests Activity

emu_window_sdl2_vk: Use the generated SDL config

Browse source 
On Linux, due to the way we include SDL2 as a submodule, it makes it
difficult for us to specify which SDL_config.h we intended to include.
Before, CMake would default to the dummy one included with SDL and
ignore the generated one.

This tells CMake to use the generated one. In addition, we define
USING_GENERATED_CONFIG_H to throw an error in case the dummy config is
used by accident. Fixes Vulkan not working on Linux yuzu-cmd.
This commit is contained in:
lat9nq 2021-07-15 21:02:00 -04:00
parent 3cd3230295
commit d3748cad73
4 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
View file

@ -15,6 +15,12 @@
#include "video_core/renderer_vulkan/renderer_vulkan.h"
#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
#define USING_GENERATED_CONFIG_H
#include <SDL_config.h>
#endif
// Include these late to avoid polluting everything with Xlib macros
// Ignore -Wimplicit-fallthrough due to https://github.com/libsdl-org/SDL/issues/4307
#ifdef __clang__