From 1e1fde5eb15c08fb664bd2f6a6f3176e7968b475 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 6 Apr 2011 14:45:27 -0500
Subject: [PATCH] OPEN-58 Ditch GL package for glext.h package since glut.h
isn't used anywhere. Probably don't need glext headers for mac or linux as
they come in with system updates.
---
autobuild.xml | 36 ++++++------------------------------
indra/cmake/OpenGL.cmake | 3 +--
2 files changed, 7 insertions(+), 32 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index ec5d7d51ac..38a6d105b2 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3,48 +3,24 @@
<map>
<key>installables</key>
<map>
- <key>GL</key>
+ <key>glext</key>
<map>
<key>license</key>
- <string>GL</string>
+ <string>glext</string>
<key>license_file</key>
- <string>LICENSES/GL.txt</string>
+ <string>LICENSES/glext.txt</string>
<key>name</key>
- <string>GL</string>
+ <string>glext</string>
<key>platforms</key>
<map>
- <key>darwin</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>0b7c1d43dc2b39301fef6c05948fb826</string>
- <key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-darwin-20101004.tar.bz2</string>
- </map>
- <key>name</key>
- <string>darwin</string>
- </map>
- <key>linux</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>d85d88088360aee5b67105ad93b5ad16</string>
- <key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux-20100929.tar.bz2</string>
- </map>
- <key>name</key>
- <string>linux</string>
- </map>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
- <string>f8d98cbe78d5aafbc7aaabf840325aaf</string>
+ <string>5de58ca0fe19abf68b25956762ee0d29</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-0.0.0-windows-20110303.tar.bz2</string>
+ <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake
index 661666f00d..0a3dd976b4 100644
--- a/indra/cmake/OpenGL.cmake
+++ b/indra/cmake/OpenGL.cmake
@@ -2,8 +2,7 @@
include(Prebuilt)
if (NOT STANDALONE)
- use_prebuilt_binary(GL)
- # possible glh_linear should have its own .cmake file instead
+ use_prebuilt_binary(glext)
use_prebuilt_binary(glh_linear)
set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
endif (NOT STANDALONE)
--
GitLab