diff options
| author | 2021-06-01 04:14:08 -0400 | |
|---|---|---|
| committer | 2021-06-01 04:14:08 -0400 | |
| commit | 65b389da702f847243dadacd3d21a263ea072a7a (patch) | |
| tree | 3617315d124dd3b8d0405871e2e9bd63a664bc0f /externals | |
| parent | Merge pull request #6318 from german77/dualJoycon (diff) | |
| parent | externals: Use defaults for building SDL2 on WIN32 (diff) | |
| download | yuzu-65b389da702f847243dadacd3d21a263ea072a7a.tar.gz yuzu-65b389da702f847243dadacd3d21a263ea072a7a.tar.xz yuzu-65b389da702f847243dadacd3d21a263ea072a7a.zip | |
Merge pull request #6396 from lat9nq/mingw-sdl-fix
externals: Use defaults for building SDL2 on WIN32
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index fe1c088ca..aae0baa0b 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -47,19 +47,21 @@ target_include_directories(unicorn-headers INTERFACE ./unicorn/include) | |||
| 47 | 47 | ||
| 48 | # SDL2 | 48 | # SDL2 |
| 49 | if (NOT SDL2_FOUND AND ENABLE_SDL2) | 49 | if (NOT SDL2_FOUND AND ENABLE_SDL2) |
| 50 | # Yuzu itself needs: Events Joystick Haptic Sensor Timers | 50 | if (NOT WIN32) |
| 51 | # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen) | 51 | # Yuzu itself needs: Events Joystick Haptic Sensor Timers |
| 52 | set(SDL_UNUSED_SUBSYSTEMS | 52 | # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen) |
| 53 | Atomic Audio Render Power Threads | 53 | set(SDL_UNUSED_SUBSYSTEMS |
| 54 | File CPUinfo Filesystem Locale) | 54 | Atomic Audio Render Power Threads |
| 55 | foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS}) | 55 | File CPUinfo Filesystem Locale) |
| 56 | string(TOUPPER ${_SUB} _OPT) | 56 | foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS}) |
| 57 | option(SDL_${_OPT} "" OFF) | 57 | string(TOUPPER ${_SUB} _OPT) |
| 58 | endforeach() | 58 | option(SDL_${_OPT} "" OFF) |
| 59 | 59 | endforeach() | |
| 60 | |||
| 61 | option(HIDAPI "" ON) | ||
| 62 | endif() | ||
| 60 | set(SDL_STATIC ON) | 63 | set(SDL_STATIC ON) |
| 61 | set(SDL_SHARED OFF) | 64 | set(SDL_SHARED OFF) |
| 62 | option(HIDAPI "" ON) | ||
| 63 | 65 | ||
| 64 | add_subdirectory(SDL EXCLUDE_FROM_ALL) | 66 | add_subdirectory(SDL EXCLUDE_FROM_ALL) |
| 65 | add_library(SDL2 ALIAS SDL2-static) | 67 | add_library(SDL2 ALIAS SDL2-static) |