diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2022-12-04 10:44:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-04 10:44:12 -0500 |
| commit | 02b10a6e4dca0ed94e20e1b7dcc69a073d1f22a4 (patch) | |
| tree | 25de4a77ee6f3f29e01470bf885b4fa58deb8323 /src/yuzu_cmd | |
| parent | f77cc6c41272265b08247aa1e2614c050acccc67 (diff) | |
| parent | 6d2c59737177dba09a0a2a31e96276addf52c172 (diff) | |
Merge pull request #9374 from liamwhite/externals
externals: update dynarmic, SDL2
Diffstat (limited to 'src/yuzu_cmd')
| -rw-r--r-- | src/yuzu_cmd/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp | 6 |
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}) target_include_directories(yuzu-cmd PRIVATE ../../externals/Vulkan-Headers/include) if (YUZU_USE_EXTERNAL_SDL2) - target_compile_definitions(yuzu-cmd PRIVATE -DYUZU_USE_EXTERNAL_SDL2) - target_include_directories(yuzu-cmd PRIVATE ${PROJECT_BINARY_DIR}/externals/SDL/include) + target_link_libraries(yuzu-cmd PRIVATE SDL2-static) +else() + target_link_libraries(yuzu-cmd PRIVATE SDL2) endif() if(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 @@ #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 <SDL.h> #include <SDL_syswm.h> |