diff options
| author | Joshua Vandaële <joshua@vandaele.software> | 2026-01-02 14:40:24 +0100 |
|---|---|---|
| committer | Joshua Vandaële <joshua@vandaele.software> | 2026-02-25 07:26:10 +0100 |
| commit | c6411a29526df99d7baa6ed6b26441fb0ab14d94 (patch) | |
| tree | 6878463b05de00fc1c5ffa5c5f65583566da67f7 /CMakeLists.txt | |
| parent | 3cea68c2e59f71a7b1e634fe31e7fd1dba670a07 (diff) | |
SDL: Use bundled LibUSB when desirable
Previously, SDL would `find_package(libusb)` which would actually overwrite the user preference in the case where both USE_SYSTEM_LIBUSB and USE_SYSTEM_SDL were OFF. This coincidentally also allows SDL to use libusb on Windows.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index de9446014d..38135abda9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -582,10 +582,6 @@ if(UNIX) add_definitions(-DUSE_MEMORYWATCHER=1) endif() -if(ENABLE_SDL) - dolphin_find_optional_system_library(SDL3 Externals/SDL 3.2.0) -endif() - if(ENABLE_ANALYTICS) message(STATUS "Enabling analytics collection (subject to end-user opt-in)") add_definitions(-DUSE_ANALYTICS=1) @@ -712,6 +708,10 @@ if(NOT ANDROID) add_definitions(-D__LIBUSB__) endif() +if(ENABLE_SDL) + dolphin_find_optional_system_library(SDL3 Externals/SDL 3.2.0) +endif() + dolphin_find_optional_system_library(SFML Externals/SFML 3.0 COMPONENTS Network System) if(USE_UPNP) |