1 files changed, 11 insertions, 14 deletions

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 1484663..e80f0c3 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -6,8 +6,8 @@
 
 include(CMakeCopyIfDifferent)
 
-set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/gstreamer-plugins")
-set(gst_plugin_debug_files
+set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins")
+set(gst_plugin_release_files
     libdshowsrcwrapper.dll
     libfsselector.dll
     libfsvalve.dll
@@ -86,15 +86,15 @@ set(gst_plugin_debug_files
     )
 
 copy_if_different(
-    ${gst_plugin_debug_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/Debug/lib/gstreamer-plugins"
+    ${gst_plugin_release_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/Release/lib/gstreamer-plugins"
     out_targets 
-    ${gst_plugin_debug_files}
+    ${gst_plugin_release_files}
     )
 set(all_targets ${all_targets} ${out_targets})
 
-set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/gstreamer-plugins")
-set(gst_plugin_release_files
+set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins")
+set(gst_plugin_debug_files
     libdshowsrcwrapper.dll
     libfsselector.dll
     libfsvalve.dll
@@ -173,10 +173,10 @@ set(gst_plugin_release_files
     )
 
 copy_if_different(
-    ${gst_plugin_release_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/Release/lib/gstreamer-plugins"
+    ${gst_plugin_debug_dir} 
+    "${CMAKE_CURRENT_BINARY_DIR}/Debug/lib/gstreamer-plugins"
     out_targets 
-    ${gst_plugin_release_files}
+    ${gst_plugin_debug_files}
     )
 set(all_targets ${all_targets} ${out_targets})
 
@@ -184,11 +184,8 @@ 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
-    vivoxsdk.dll
     ortp.dll
     wrap_oal.dll
     )
@@ -414,4 +411,4 @@ if (MSVC80)
     endif (EXISTS ${release_msvc8_redist_path})
 endif (MSVC80)
 
-add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
+add_custom_target(copy_win_libs ALL DEPENDS ${all_targets})
\ No newline at end of file