aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog.txt6
-rw-r--r--linden/indra/cmake/00-Common.cmake9
-rw-r--r--linden/indra/cmake/Variables.cmake2
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index b7505be..7a9ab99 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
12009-11-30 McCabe Maxsted <hakushakukun@gmail.com> 12009-11-30 McCabe Maxsted <hakushakukun@gmail.com>
2 2
3 * Made downloading the artwork work while using the --standalone flag.
4
5 modified: linden/indra/cmake/00-Common.cmake
6 modified: linden/indra/cmake/Variables.cmake
7
8
3 * Added Imprudence viewer artwork to install.xml. 9 * Added Imprudence viewer artwork to install.xml.
4 10
5 deleted: linden/indra/newview/res-sdl/imprudence_icon.BMP 11 deleted: linden/indra/newview/res-sdl/imprudence_icon.BMP
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 1b5e9d2..746a3bf 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -5,10 +5,15 @@
5include(Variables) 5include(Variables)
6include(Prebuilt) 6include(Prebuilt)
7 7
8# Download viewer artwork 8# Download viewer artwork even when using standalone
9 9
10if (STANDALONE)
11 set(STANDALONE OFF)
12 use_prebuilt_binary(artwork)
13 set(STANDALONE ON)
14else (STANDALONE)
10 use_prebuilt_binary(artwork) 15 use_prebuilt_binary(artwork)
11 16endif (STANDALONE)
12 17
13# Portable compilation flags. 18# Portable compilation flags.
14 19
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index 8f33a95..5d4dffe 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -82,7 +82,7 @@ set(VIEWER ON CACHE BOOL "Build Second Life viewer.")
82set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name") 82set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name")
83set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") 83set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
84 84
85set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") 85set(STANDALONE OFF CACHE BOOL "Do not use Imprudence-supplied prebuilt libraries.")
86 86
87if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) 87if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
88 set(SERVER ON CACHE BOOL "Build Second Life server software.") 88 set(SERVER ON CACHE BOOL "Build Second Life server software.")