summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd
diff options
context:
space:
mode:
Diffstat (limited to 'src/yuzu_cmd')
-rw-r--r--src/yuzu_cmd/CMakeLists.txt5
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp6
2 files changed, 3 insertions, 8 deletions
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt
index 13b673186..607b4e6aa 100644
--- a/src/yuzu_cmd/CMakeLists.txt
+++ b/src/yuzu_cmd/CMakeLists.txt
@@ -46,8 +46,9 @@ target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR})
46target_include_directories(yuzu-cmd PRIVATE ../../externals/Vulkan-Headers/include) 46target_include_directories(yuzu-cmd PRIVATE ../../externals/Vulkan-Headers/include)
47 47
48if (YUZU_USE_EXTERNAL_SDL2) 48if (YUZU_USE_EXTERNAL_SDL2)
49 target_compile_definitions(yuzu-cmd PRIVATE -DYUZU_USE_EXTERNAL_SDL2) 49 target_link_libraries(yuzu-cmd PRIVATE SDL2-static)
50 target_include_directories(yuzu-cmd PRIVATE ${PROJECT_BINARY_DIR}/externals/SDL/include) 50else()
51 target_link_libraries(yuzu-cmd PRIVATE SDL2)
51endif() 52endif()
52 53
53if(UNIX AND NOT APPLE) 54if(UNIX AND NOT APPLE)
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 0d580fe4f..9ed47d453 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
@@ -12,12 +12,6 @@
12#include "video_core/renderer_vulkan/renderer_vulkan.h" 12#include "video_core/renderer_vulkan/renderer_vulkan.h"
13#include "yuzu_cmd/emu_window/emu_window_sdl2_vk.h" 13#include "yuzu_cmd/emu_window/emu_window_sdl2_vk.h"
14 14
15#ifdef YUZU_USE_EXTERNAL_SDL2
16// Include this before SDL.h to prevent the external from including a dummy
17#define USING_GENERATED_CONFIG_H
18#include <SDL_config.h>
19#endif
20
21#include <SDL.h> 15#include <SDL.h>
22#include <SDL_syswm.h> 16#include <SDL_syswm.h>
23 17