This commit is contained in:
Beeks
2010-08-22 15:14:30 -04:00
parent 88cf144936
commit 5ce4286fd7
164 changed files with 31303 additions and 22286 deletions

View File

@@ -96,17 +96,17 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(GRID agni CACHE STRING "Target Grid")
set(VIEWER ON CACHE BOOL "Build Second Life viewer.")
set(VIEWER_CHANNEL "Inertia" CACHE STRING "Viewer Channel Name")
set(VIEWER_CHANNEL "Ascent" CACHE STRING "Viewer Channel Name")
set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
set(VIEWER_BRANDING_ID "snowglobe" CACHE STRING "Viewer branding id (currently secondlife|snowglobe)")
set(VIEWER_BRANDING_ID "Ascent" CACHE STRING "Viewer branding id (currently secondlife|snowglobe)")
# *TODO: break out proper Branding-secondlife.cmake, Branding-snowglobe.cmake, etc
if (${VIEWER_BRANDING_ID} MATCHES "secondlife")
set(VIEWER_BRANDING_NAME "Second Life")
set(VIEWER_BRANDING_NAME_CAMELCASE "SecondLife")
elseif (${VIEWER_BRANDING_ID} MATCHES "snowglobe")
set(VIEWER_BRANDING_NAME "Snowglobe")
set(VIEWER_BRANDING_NAME_CAMELCASE "Snowglobe")
elseif (${VIEWER_BRANDING_ID} MATCHES "Ascent")
set(VIEWER_BRANDING_NAME "Ascent")
set(VIEWER_BRANDING_NAME_CAMELCASE "Ascent")
endif (${VIEWER_BRANDING_ID} MATCHES "secondlife")
set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")