diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-06-24 11:13:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-06-24 11:13:54 -0500 |
| commit | 34ee8eb2773b2f55fe917d16eb9c9a1481d3af8a (patch) | |
| tree | 7f802443bd30319013f7458e17e4ed5c374b36cc /indra/cmake | |
| parent | bce1e9a51581fc42072dbc1448db38e5069c7378 (diff) | |
| parent | 14cba35bbce3f2103d34e02eb312981cb4789a0c (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
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) |