From 7abecb48babe6a6f09bf6692ba55076546cfced9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 1 Dec 2008 17:39:58 -0600
Subject: Second Life viewer sources 1.22.0-RC

---
 linden/indra/cmake/CopyWinLibs.cmake | 55 ++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

(limited to 'linden/indra/cmake/CopyWinLibs.cmake')

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 345761a..b74ce4f 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -148,6 +148,61 @@ else(EXISTS ${internal_llkdu_path})
    
 endif (EXISTS ${internal_llkdu_path})
 
+# Copy MS C runtime dlls, required for packaging.
+# *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
+        )
+
+    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})
+    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
+        )
+
+    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}/RelWithDebInfo"
+            out_targets 
+            ${release_msvc8_files}
+            )
+        set(all_targets ${all_targets} ${out_targets})
+
+    endif (EXISTS ${release_msvc8_redist_path})
+endif (MSVC80)
+
 add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
 
 if(EXISTS ${internal_llkdu_path})
-- 
cgit v1.1


From 22b861982f2efd5d16097a012627e73b9fb85834 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 9 Dec 2008 22:25:37 -0600
Subject: Second Life viewer sources 1.22.2-RC

---
 linden/indra/cmake/CopyWinLibs.cmake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'linden/indra/cmake/CopyWinLibs.cmake')

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index b74ce4f..d4ddb23 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -153,7 +153,8 @@ endif (EXISTS ${internal_llkdu_path})
 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
+         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
+        NO_DEFAULT_PATH
         )
 
     if(EXISTS ${debug_msvc8_redist_path})
@@ -174,7 +175,8 @@ if (MSVC80)
 
     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
+         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
+        NO_DEFAULT_PATH
         )
 
     if(EXISTS ${release_msvc8_redist_path})
-- 
cgit v1.1


From 61f97b33f9850d21965d397b947a298c16ba576d Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 12 Feb 2009 02:06:41 -0600
Subject: Second Life viewer sources 1.22.8-RC

---
 linden/indra/cmake/CopyWinLibs.cmake | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'linden/indra/cmake/CopyWinLibs.cmake')

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index d4ddb23..92b5d71 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -8,12 +8,7 @@ include(CMakeCopyIfDifferent)
 
 set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
 set(vivox_files
-    tntk.dll
-    libeay32.dll
     SLVoice.exe
-    ssleay32.dll
-    SLVoiceAgent.exe
-    srtp.dll
     alut.dll
     vivoxsdk.dll
     ortp.dll
-- 
cgit v1.1