From aeb1f944aa423bd652f4e33a2e37aa19e80b9a8c Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 4 Aug 2011 16:52:19 -0400 Subject: storm-1060 : add windows (thanks Kadah and Michelle), remove some files I think are no longer used --- indra/newview/CMakeLists.txt | 26 ++++++++++++++++++++++++++ indra/newview/res-sdl/ll_icon.BMP | Bin 262198 -> 0 bytes indra/newview/res/ll_icon.BMP | Bin 262198 -> 0 bytes indra/newview/res/ll_icon.ico | Bin 367958 -> 0 bytes indra/newview/res/ll_icon.png | Bin 29561 -> 0 bytes 5 files changed, 26 insertions(+) delete mode 100644 indra/newview/res-sdl/ll_icon.BMP delete mode 100644 indra/newview/res/ll_icon.BMP delete mode 100644 indra/newview/res/ll_icon.ico delete mode 100644 indra/newview/res/ll_icon.png (limited to 'indra') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 935dd2e887..f87ecbd2f5 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1248,6 +1248,31 @@ if (WINDOWS) set(viewer_SOURCE_FILES "${viewer_SOURCE_FILES}" llviewerprecompiledheaders.cpp) endif(USE_PRECOMPILED_HEADERS) + # Replace the icons with the appropriate ones for the channel + set(ICON_PATH "test") + string(TOLOWER ${VIEWER_CHANNEL} channel_lower) + if(channel_lower MATCHES "^(release|beta|development)") + set(ICON_PATH ${channel_lower}) + elseif(channel_lower MATCHES "^(project.*)") + set(ICON_PATH "project") + endif() + message("Copying icons for ${ICON_PATH}") + execute_process( + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_PATH}/secondlife.ico" + "${CMAKE_CURRENT_SOURCE_DIR}/res/ll_icon.ico" + ) + execute_process( + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_PATH}/secondlife_256.BMP" + "${CMAKE_CURRENT_SOURCE_DIR}/res/ll_icon.BMP" + ) + execute_process( + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_PATH}/secondlife_256.BMP" + "${CMAKE_CURRENT_SOURCE_DIR}/res-sdl/ll_icon.BMP" + ) + # Add resource files to the project. # viewerRes.rc is the only buildable file, but # the rest are all dependencies of it. @@ -1277,6 +1302,7 @@ if (WINDOWS) res/lltooltranslate.cur res/lltoolzoomin.cur res/lltoolzoomout.cur + res-sdl/ll_icon.BMP res/ll_icon.BMP res/ll_icon.ico res/resource.h diff --git a/indra/newview/res-sdl/ll_icon.BMP b/indra/newview/res-sdl/ll_icon.BMP deleted file mode 100644 index 6f9366df41..0000000000 Binary files a/indra/newview/res-sdl/ll_icon.BMP and /dev/null differ diff --git a/indra/newview/res/ll_icon.BMP b/indra/newview/res/ll_icon.BMP deleted file mode 100644 index 3a9964cd95..0000000000 Binary files a/indra/newview/res/ll_icon.BMP and /dev/null differ diff --git a/indra/newview/res/ll_icon.ico b/indra/newview/res/ll_icon.ico deleted file mode 100644 index 87985b9285..0000000000 Binary files a/indra/newview/res/ll_icon.ico and /dev/null differ diff --git a/indra/newview/res/ll_icon.png b/indra/newview/res/ll_icon.png deleted file mode 100644 index ae573b3874..0000000000 Binary files a/indra/newview/res/ll_icon.png and /dev/null differ -- cgit v1.2.3