4 files changed, 21 insertions, 19 deletions

diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake
index 50b8eff..a84a09f 100644
--- a/linden/indra/cmake/Boost.cmake
+++ b/linden/indra/cmake/Boost.cmake
@@ -16,17 +16,7 @@ else (STANDALONE)
 
   if (WINDOWS)
     set(BOOST_VERSION 1_36)
-    if (MSVC71)
-      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-vc71-mt-${BOOST_VERSION}
-          debug libboost_program_options-vc71-mt-gd-${BOOST_VERSION})
-      set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-vc71-mt-${BOOST_VERSION}
-          debug libboost_regex-vc71-mt-gd-${BOOST_VERSION})
-      set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-vc71-mt-${BOOST_VERSION}
-          debug libboost_signals-vc71-mt-gd-${BOOST_VERSION})
-    elseif (MSVC80)
+    if (MSVC80)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
           optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
           debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
@@ -46,7 +36,7 @@ else (STANDALONE)
       set(BOOST_SIGNALS_LIBRARY 
           optimized libboost_signals-vc90-mt-${BOOST_VERSION}
           debug libboost_signals-vc90-mt-gd-${BOOST_VERSION})
-    endif (MSVC71)
+    endif (MSVC80)
   elseif (DARWIN)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
     set(BOOST_REGEX_LIBRARY boost_regex-mt)
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 52f000f..add94dd 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -1,7 +1,7 @@
 # -*- cmake -*-
 
 # The copy_win_libs folder contains file lists and a script used to 
-# copy dlls, exes and such needed to run the SecondLife from within 
+# copy dlls, exes and such needed to run Imprudence from within 
 # VisualStudio. 
 
 include(CMakeCopyIfDifferent)
@@ -62,7 +62,6 @@ set(debug_files
         libogg-0.dll
         liboil-0.3-0.dll
         libopenjpeg-2.dll
-    libpng12-0.dll
         libschroedinger-1.0-0.dll
         libspeex-1.dll
         libtheora-0.dll
@@ -137,7 +136,6 @@ set(release_files
         libogg-0.dll
         liboil-0.3-0.dll
         libopenjpeg-2.dll
-    libpng12-0.dll
         libschroedinger-1.0-0.dll
         libspeex-1.dll
         libtheora-0.dll
@@ -198,7 +196,7 @@ if (MSVC80)
             ARGS
               ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
               ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLifeDebug.exe.config
+              ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config
               ${debug_appconfig_file}
             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
             COMMENT "Creating debug app config file"
@@ -243,7 +241,7 @@ if (MSVC80)
             ARGS
               ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
               ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
+              ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
               ${release_appconfig_file}
             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
             COMMENT "Creating release app config file"
@@ -256,7 +254,7 @@ if (MSVC80)
             ARGS
               ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
               ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
-              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
+              ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config
               ${relwithdebinfo_appconfig_file}
             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
             COMMENT "Creating relwithdebinfo app config file"
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.")
 set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name")
 set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
 
-set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
+set(STANDALONE OFF CACHE BOOL "Do not use Imprudence-supplied prebuilt libraries.")
 
 if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
     set(SERVER ON CACHE BOOL "Build Second Life server software.")
diff --git a/linden/indra/cmake/ViewerArtwork.cmake b/linden/indra/cmake/ViewerArtwork.cmake
new file mode 100644
index 0000000..f01109a
--- /dev/null
+++ b/linden/indra/cmake/ViewerArtwork.cmake
@@ -0,0 +1,14 @@
+# -*- cmake -*-
+#
+# Download viewer artwork even when using standalone
+
+include(Variables)
+include(Prebuilt)
+
+if (NOT STANDALONE)
+  use_prebuilt_binary(artwork)
+else (NOT STANDALONE)
+  set(STANDALONE OFF)
+    use_prebuilt_binary(artwork)
+  set(STANDALONE ON)
+endif (NOT STANDALONE)