From 9869aaddab30a61c74309035e9a8aa054b46e8bc Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 4 Jun 2024 10:55:45 -0400
Subject: [PATCH] Allow building SDL2 on windows
---
indra/llwindow/CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index c6aac1c2622..53056492e62 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -60,7 +60,7 @@ set(llwindow_LINK_LIBRARIES
)
# Libraries on which this library depends, needed for Linux builds
# Sort by high-level to low-level
-if (LINUX)
+if (USE_SDL OR LINUX)
list(APPEND viewer_SOURCE_FILES
llkeyboardsdl.cpp
llwindowsdl.cpp
@@ -70,7 +70,7 @@ if (LINUX)
llwindowsdl.h
)
- if (BUILD_HEADLESS)
+ if (BUILD_HEADLESS AND LINUX)
set(llwindowheadless_LINK_LIBRARIES
${LLCOMMON_LIBRARIES}
${LLIMAGE_LIBRARIES}
@@ -81,13 +81,13 @@ if (LINUX)
${LLXML_LIBRARIES}
fontconfig # For FCInit and other FC* functions.
)
- endif (BUILD_HEADLESS)
+ endif ()
list(APPEND llwindow_LINK_LIBRARIES
ll::SDL2
)
-endif (LINUX)
+endif ()
if (DARWIN)
list(APPEND llwindow_SOURCE_FILES
--
GitLab