diff options
| author | Andrew Meadows <leviathan@lindenlab.com> | 2024-10-04 11:07:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-04 11:07:47 -0700 |
| commit | f89abf259dddfe9086de9d96e0b6d65a427f2971 (patch) | |
| tree | d90b74f4ec320a3bc53a889eb5ba41d18b00ab52 /indra/cmake/LLWindow.cmake | |
| parent | 4339ad9a528c82946ce40ec2bd240b41d104f338 (diff) | |
| parent | 2f07279ccaf5aecc45ed9a78d337e73ab58d89a7 (diff) | |
Merge pull request #1934 from secondlife/leviathan/game-control
Add GameControl behind feature-flag
Diffstat (limited to 'indra/cmake/LLWindow.cmake')
| -rw-r--r-- | indra/cmake/LLWindow.cmake | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index 23f4115aeb..a5791f1bef 100644 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake @@ -3,18 +3,11 @@ include(Variables) include(GLEXT) include(Prebuilt) +include(SDL2) include_guard() -add_library( ll::SDL INTERFACE IMPORTED ) - if (LINUX) - #Must come first as use_system_binary can exit this file early - target_compile_definitions( ll::SDL INTERFACE LL_SDL_VERSION=2 LL_SDL) - - #find_package(SDL2 REQUIRED) - #target_link_libraries( ll::SDL INTERFACE SDL2::SDL2 SDL2::SDL2main X11) - - use_prebuilt_binary(SDL2) - target_link_libraries( ll::SDL INTERFACE SDL2 X11) + # linux uses SDL2 for window and keyboard + target_compile_definitions( ll::SDL2 INTERFACE LL_USE_SDL_KEYBOARD=1 ) endif (LINUX) |