From 08acbbec54a14a0a4e4ed2c07bc0378073543ab7 Mon Sep 17 00:00:00 2001 From: Zi Ree Date: Tue, 9 Aug 2022 14:48:20 +0200 Subject: [PATCH] Linux SDL2 - Make SDL2 default, remove USE__SDL2 flag, add USE_SDL1 flag instead to go back to SDL1 if needed --- indra/cmake/LLWindow.cmake | 2 +- indra/llwindow/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index 1b0370cc14..58b842f4b5 100644 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake @@ -18,7 +18,7 @@ if (USESYSTEMLIBS) ) else (USESYSTEMLIBS) if (LINUX) - if( NOT USE_SDL2 ) + if( USE_SDL1 ) use_prebuilt_binary(SDL) set (SDL_FOUND TRUE) diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt index 299a434d76..69beec1c19 100644 --- a/indra/llwindow/CMakeLists.txt +++ b/indra/llwindow/CMakeLists.txt @@ -81,7 +81,7 @@ if (LINUX) libfreetype.a ) - if( NOT USE_SDL2 ) + if( USE_SDL1 ) list(APPEND viewer_SOURCE_FILES llkeyboardsdl.cpp llwindowsdl.cpp