diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-06-24 15:22:27 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-06-24 15:22:27 +0000 |
| commit | 14cba35bbce3f2103d34e02eb312981cb4789a0c (patch) | |
| tree | bc4c162304eb7498cbd15664146142c4ce3131de /indra/cmake | |
| parent | a68b6087deb68a824c2b9e8ccb1111c6c8b70045 (diff) | |
| parent | a6774ca4dd3469fe1c98a53a59153c6e2db76940 (diff) | |
Merged in brad/unbreak-mac-build (pull request #1034)
Unbreak DRTVWR-559 mac build
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/GLEXT.cmake | 4 | ||||
| -rw-r--r-- | indra/cmake/LLRender.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/GLEXT.cmake b/indra/cmake/GLEXT.cmake index 9fd3923bfd..a749644202 100644 --- a/indra/cmake/GLEXT.cmake +++ b/indra/cmake/GLEXT.cmake @@ -2,9 +2,7 @@ include(Prebuilt) if (NOT USESYSTEMLIBS) - if (WINDOWS OR LINUX) - use_prebuilt_binary(glext) - endif (WINDOWS OR LINUX) + use_prebuilt_binary(glext) use_prebuilt_binary(glh_linear) set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) endif (NOT USESYSTEMLIBS) diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake index 868922451f..2d9d3725ad 100644 --- a/indra/cmake/LLRender.cmake +++ b/indra/cmake/LLRender.cmake @@ -3,10 +3,12 @@ include(Variables) include(FreeType) include(GLH) +include(GLEXT) set(LLRENDER_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llrender ${GLH_INCLUDE_DIR} + ${GLEXT_INCLUDE_DIR} ) if (BUILD_HEADLESS) |