3 files changed, 97 insertions, 91 deletions

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index add94dd..8767980 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -62,6 +62,7 @@ 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
@@ -136,6 +137,7 @@ 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
@@ -165,103 +167,102 @@ set(all_targets ${all_targets} ${out_targets})
 
 
 # Copy MS C runtime dlls, required for packaging.
+# We always need the VS 2005 redist.
 # *TODO - Adapt this to support VC9
-if (MSVC80)
-    FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
-        PATHS
-         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
-        NO_DEFAULT_PATH
-        NO_DEFAULT_PATH
+FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
+    PATHS
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
+    NO_DEFAULT_PATH
+    NO_DEFAULT_PATH
+    )
+
+if(EXISTS ${debug_msvc8_redist_path})
+    set(debug_msvc8_files
+        msvcr80d.dll
+        msvcp80d.dll
+        Microsoft.VC80.DebugCRT.manifest
         )
 
-    if(EXISTS ${debug_msvc8_redist_path})
-        set(debug_msvc8_files
-            msvcr80d.dll
-            msvcp80d.dll
-            Microsoft.VC80.DebugCRT.manifest
-            )
+    copy_if_different(
+        ${debug_msvc8_redist_path} 
+        "${CMAKE_CURRENT_BINARY_DIR}/Debug"
+        out_targets 
+        ${debug_msvc8_files}
+        )
+    set(all_targets ${all_targets} ${out_targets})
 
-        copy_if_different(
-            ${debug_msvc8_redist_path} 
-            "${CMAKE_CURRENT_BINARY_DIR}/Debug"
-            out_targets 
-            ${debug_msvc8_files}
-            )
-        set(all_targets ${all_targets} ${out_targets})
+    set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/${VIEWER_BINARY_NAME}.exe.config)
+    add_custom_command(
+        OUTPUT ${debug_appconfig_file}
+        COMMAND ${PYTHON_EXECUTABLE}
+        ARGS
+          ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
+          ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
+          ${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"
+        )
 
-        set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/${VIEWER_BINARY_NAME}.exe.config)
-        add_custom_command(
-            OUTPUT ${debug_appconfig_file}
-            COMMAND ${PYTHON_EXECUTABLE}
-            ARGS
-              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
-              ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
-              ${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"
-            )
+endif (EXISTS ${debug_msvc8_redist_path})
 
-    endif (EXISTS ${debug_msvc8_redist_path})
+FIND_PATH(release_msvc8_redist_path msvcr80.dll
+    PATHS
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
+    NO_DEFAULT_PATH
+    NO_DEFAULT_PATH
+    )
 
-    FIND_PATH(release_msvc8_redist_path msvcr80.dll
-        PATHS
-         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
-        NO_DEFAULT_PATH
-        NO_DEFAULT_PATH
+if(EXISTS ${release_msvc8_redist_path})
+    set(release_msvc8_files
+        msvcr80.dll
+        msvcp80.dll
+        Microsoft.VC80.CRT.manifest
         )
 
-    if(EXISTS ${release_msvc8_redist_path})
-        set(release_msvc8_files
-            msvcr80.dll
-            msvcp80.dll
-            Microsoft.VC80.CRT.manifest
-            )
-
-        copy_if_different(
-            ${release_msvc8_redist_path} 
-            "${CMAKE_CURRENT_BINARY_DIR}/Release"
-            out_targets 
-            ${release_msvc8_files}
-            )
-        set(all_targets ${all_targets} ${out_targets})
+    copy_if_different(
+        ${release_msvc8_redist_path} 
+        "${CMAKE_CURRENT_BINARY_DIR}/Release"
+        out_targets 
+        ${release_msvc8_files}
+        )
+    set(all_targets ${all_targets} ${out_targets})
 
-        copy_if_different(
-            ${release_msvc8_redist_path} 
-            "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
-            out_targets 
-            ${release_msvc8_files}
-            )
-        set(all_targets ${all_targets} ${out_targets})
+    copy_if_different(
+        ${release_msvc8_redist_path} 
+        "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
+        out_targets 
+        ${release_msvc8_files}
+        )
+    set(all_targets ${all_targets} ${out_targets})
 
-        set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
-        add_custom_command(
-            OUTPUT ${release_appconfig_file}
-            COMMAND ${PYTHON_EXECUTABLE}
-            ARGS
-              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
-              ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
-              ${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"
-            )
+    set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
+    add_custom_command(
+        OUTPUT ${release_appconfig_file}
+        COMMAND ${PYTHON_EXECUTABLE}
+        ARGS
+          ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
+          ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
+          ${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"
+        )
 
-        set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)
-        add_custom_command(
-            OUTPUT ${relwithdebinfo_appconfig_file}
-            COMMAND ${PYTHON_EXECUTABLE}
-            ARGS
-              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
-              ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
-              ${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"
-            )
-          
-    endif (EXISTS ${release_msvc8_redist_path})
-endif (MSVC80)
+    set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)
+    add_custom_command(
+        OUTPUT ${relwithdebinfo_appconfig_file}
+        COMMAND ${PYTHON_EXECUTABLE}
+        ARGS
+          ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
+          ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
+          ${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"
+        )
+      
+endif (EXISTS ${release_msvc8_redist_path})
 
 add_custom_target(copy_win_libs ALL
   DEPENDS 
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 71cbd67..60abef3 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -14,10 +14,11 @@ if (OPENAL)
   use_prebuilt_binary(openal)
   
   if (WINDOWS)
-    find_library(OPENAL_LIB
-      NAMES openal32
-      PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+    set(OPENAL_LIB
+          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/openal32.lib
+          debug ${ARCH_PREBUILT_DIRS_DEBUG}/openal32.lib
       )
+  
   elseif (DARWIN)
     # Look for for system's OpenAL.framework
     find_library(OPENAL_LIB
@@ -59,9 +60,9 @@ if (OPENAL)
   # ALUT_LIB
 
   if (WINDOWS)
-   find_library(ALUT_LIB
-     NAMES alut freealut
-     PATHS ${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release
+   set(ALUT_LIB
+         optimized ${ARCH_PREBUILT_DIRS_RELEASE}/alut.lib
+         debug ${ARCH_PREBUILT_DIRS_DEBUG}/alut.lib
      )
   elseif (DARWIN)
     find_library( ALUT_LIB
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 2a8abda..7bd306b 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -7,3 +7,7 @@ if (NOT STANDALONE)
   use_prebuilt_binary(fontconfig)
 endif(NOT STANDALONE)
 
+if (WINDOWS)
+  use_prebuilt_binary(dbghelp)
+endif (WINDOWS)
+