From 99b82d944937ce321f64aa91fb18ab2aedd3992a Mon Sep 17 00:00:00 2001
From: "Graham Linden graham@lindenlab.com"
<Graham Linden graham@lindenlab.com>
Date: Sun, 18 Feb 2018 15:52:23 +0000
Subject: Atmospherics WIP
libatmosphere integrated in indra/llrender/llatmosphere.cpp
Still working on runtime shaders to use libatmosphere precomputed atmospherics textures
---
indra/cmake/LLRender.cmake | 1 +
1 file changed, 1 insertion(+)
(limited to 'indra/cmake')
diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake
index 868922451f..0940d1de63 100644
--- a/indra/cmake/LLRender.cmake
+++ b/indra/cmake/LLRender.cmake
@@ -3,6 +3,7 @@
include(Variables)
include(FreeType)
include(GLH)
+include(Atmosphere)
set(LLRENDER_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llrender
--
cgit v1.2.3
From 6cc4a091b3ba4dd4842cc06e3b34af3d04dc5796 Mon Sep 17 00:00:00 2001
From: "Graham Linden graham@lindenlab.com"
<Graham Linden graham@lindenlab.com>
Date: Thu, 22 Feb 2018 00:35:24 +0000
Subject: Add settings/validations for new advanced atmo settings.
---
indra/cmake/Atmosphere.cmake | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 indra/cmake/Atmosphere.cmake
(limited to 'indra/cmake')
diff --git a/indra/cmake/Atmosphere.cmake b/indra/cmake/Atmosphere.cmake
new file mode 100644
index 0000000000..0975e3df02
--- /dev/null
+++ b/indra/cmake/Atmosphere.cmake
@@ -0,0 +1,5 @@
+# -*- cmake -*-
+include(Prebuilt)
+use_prebuilt_binary(libatmosphere)
+set(LIBATMOSPHERE_LIBRARIES libatmosphere)
+set(LIBATMOSPHERE_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/atmosphere)
--
cgit v1.2.3
From 1d522aca8a5d5205f6d6150699ce5b9b8425c007 Mon Sep 17 00:00:00 2001
From: "Graham Linden graham@lindenlab.com"
<Graham Linden graham@lindenlab.com>
Date: Tue, 6 Mar 2018 19:20:52 +0000
Subject: Reference updated libatmosphere package.
---
indra/cmake/Atmosphere.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/Atmosphere.cmake b/indra/cmake/Atmosphere.cmake
index 0975e3df02..9c14df2a11 100644
--- a/indra/cmake/Atmosphere.cmake
+++ b/indra/cmake/Atmosphere.cmake
@@ -1,5 +1,5 @@
# -*- cmake -*-
include(Prebuilt)
use_prebuilt_binary(libatmosphere)
-set(LIBATMOSPHERE_LIBRARIES libatmosphere)
+set(LIBATMOSPHERE_LIBRARIES atmosphere)
set(LIBATMOSPHERE_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/atmosphere)
--
cgit v1.2.3
From d8eff424a5fb340b828802351e2b7f6b63bfa30f Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Sat, 2 Mar 2019 07:17:46 -0800
Subject: SL-10664
---
indra/cmake/LLRender.cmake | 1 -
1 file changed, 1 deletion(-)
(limited to 'indra/cmake')
diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake
index 0940d1de63..868922451f 100644
--- a/indra/cmake/LLRender.cmake
+++ b/indra/cmake/LLRender.cmake
@@ -3,7 +3,6 @@
include(Variables)
include(FreeType)
include(GLH)
-include(Atmosphere)
set(LLRENDER_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llrender
--
cgit v1.2.3