From 9ac2e961e3649ca03e333103d851005f2003ddbb Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Tue, 3 Jun 2025 16:57:51 +0800
Subject: Re-include GLEXT.cmake, but for Windows only

There doesn't seem to be glext.h on Windows, so we'll just use the
package from LL for now.
---
 indra/cmake/CMakeLists.txt    | 1 +
 indra/cmake/GLEXT.cmake       | 4 +++-
 indra/cmake/LLWindow.cmake    | 2 +-
 indra/llwindow/CMakeLists.txt | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 746d242560..5525ac9f24 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -24,6 +24,7 @@ set(cmake_SOURCE_FILES
         FindAutobuild.cmake
         FMODSTUDIO.cmake
         FreeType.cmake
+        GLEXT.cmake
         GLH.cmake
         GLM.cmake
         Havok.cmake
diff --git a/indra/cmake/GLEXT.cmake b/indra/cmake/GLEXT.cmake
index a780966f0c..f45b27e7b8 100644
--- a/indra/cmake/GLEXT.cmake
+++ b/indra/cmake/GLEXT.cmake
@@ -3,7 +3,9 @@ include(Prebuilt)
 include(GLH)
 
 add_library( ll::glext INTERFACE IMPORTED )
-use_system_binary(glext)
+#use_system_binary(glext)
+if (WINDOWS)
 use_prebuilt_binary(glext)
+endif ()
 
 
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index 34df3ad33b..007b8dfba6 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -1,7 +1,7 @@
 # -*- cmake -*-
 
 include(Variables)
-include(GLH)
+include(GLEXT)
 include(Prebuilt)
 
 include_guard()
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 1f0820a9f6..d29bd5cde4 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -55,6 +55,7 @@ set(llwindow_LINK_LIBRARIES
         llfilesystem
         llxml
         ll::glm
+        ll::glext
         ll::uilibraries
         ll::SDL
         )
-- 
cgit v1.2.3