From 2d4de107f8fc3714f75f73fc9293c87eaf0e5acb Mon Sep 17 00:00:00 2001 From: Nicky Dasmijn Date: Sun, 14 Apr 2024 15:14:23 +0200 Subject: Feature/linux gtk removal (#1225) * GTK remnants removal Remove old GTK code and wire up some missing fltk logic in llfilepicker This will leave linux_crash_logger as an empy stub which could be used as a skeleton in case crash logging gets implemented. Otherwise linux_crash_logger and what is left of it in some cmake files can be deleted. * Update SDL2 to latest version. This revealed openal has also a dependebcy on sndio. Consequently the dependency was moved to OPENMAL.cmake and canot be dropped. * Handle missing filetypes: FFSAVE_GLTF,FFLOAD_GLTF, FFLOAD_MATERIAL, FFLOAD_MATERIAL_TEXTURE --- indra/cmake/LLWindow.cmake | 2 +- indra/cmake/OPENAL.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index 6c7b70461f..23f4115aeb 100644 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake @@ -16,5 +16,5 @@ if (LINUX) #target_link_libraries( ll::SDL INTERFACE SDL2::SDL2 SDL2::SDL2main X11) use_prebuilt_binary(SDL2) - target_link_libraries( ll::SDL INTERFACE SDL2 sndio X11) + target_link_libraries( ll::SDL INTERFACE SDL2 X11) endif (LINUX) diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake index 0b6a7c2853..6a28846029 100644 --- a/indra/cmake/OPENAL.cmake +++ b/indra/cmake/OPENAL.cmake @@ -31,6 +31,7 @@ if (USE_OPENAL) target_link_libraries( ll::openal INTERFACE openal alut + sndio ) else() message(FATAL_ERROR "OpenAL is not available for this platform") -- cgit v1.2.3