1 files changed, 172 insertions, 129 deletions

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index b544c15..2bea40c 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -6,6 +6,7 @@
 
 include(CMakeCopyIfDifferent)
 
+# Copying vivox's alut.dll breaks inworld audio, never use it
 set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
 set(vivox_files
     SLVoice.exe
@@ -14,76 +15,20 @@ set(vivox_files
     ortp.dll
     wrap_oal.dll
     )
+copy_if_different(
+    ${vivox_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/Debug"
+    out_targets
+    ${vivox_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
 
 set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
 set(debug_files
     alut.dll
-    freebl3.dll
-    js3250.dll
-    nspr4.dll
-    nss3.dll
-    nssckbi.dll
     openal32.dll
     openjpegd.dll
     libhunspell.dll
-    plc4.dll
-    plds4.dll
-    smime3.dll
-    softokn3.dll
-    ssl3.dll
-    xpcom.dll
-    xul.dll
-    windbgdlg.exe
-    iconv.dll
-    libxml2.dll
-        libcairo-2.dll
-        libfaad-2.dll
-    libgio-2.0-0.dll
-    libglib-2.0-0.dll
-    libgmodule-2.0-0.dll
-    libgobject-2.0-0.dll
-    libgthread-2.0-0.dll
-    charset.dll
-        intl.dll
-        libgcrypt-11.dll
-        libgnutls-26.dll
-        libgpg-error-0.dll
-        libgstapp.dll
-        libgstaudio.dll
-        libgstaudio-0.10.dll
-        libgstbase-0.10.dll
-        libgstcdda.dll
-        libgstcontroller-0.10.dll
-        libgstdataprotocol-0.10.dll
-        libgstdshow.dll
-        libgstfft.dll
-        libgstinterfaces.dll
-        libgstnet-0.10.dll
-        libgstnetbuffer.dll
-        libgstpbutils.dll
-        libgstreamer-0.10.dll
-        libgstriff.dll
-        libgstrtp.dll
-        libgstrtsp.dll
-        libgstsdp.dll
-        libgsttag.dll
-        libgstvideo.dll
-        libjpeg.dll
-        libmp3lame-0.dll
-        libneon-27.dll
-        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
-        libvorbis-0.dll
-        libvorbisenc-2.dll
-        libxml2-2.dll
-        glew32.dll
-    xvidcore.dll
-    zlib1.dll
     )
 
 copy_if_different(
@@ -94,82 +39,180 @@ copy_if_different(
     )
 set(all_targets ${all_targets} ${out_targets})
 
+# Debug config runtime files required for the plugin test mule
+set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
+set(plugintest_debug_files
+    libeay32.dll
+    libglib-2.0-0.dll
+    libgmodule-2.0-0.dll
+    libgobject-2.0-0.dll
+    libgthread-2.0-0.dll
+    qtcored4.dll
+    qtguid4.dll
+    qtnetworkd4.dll
+    qtopengld4.dll
+    qtwebkitd4.dll
+    ssleay32.dll
+    )
 copy_if_different(
-    ${vivox_src_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/Debug"
-    out_targets 
-    ${vivox_files}
+    ${plugintest_debug_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug"
+    out_targets
+    ${plugintest_debug_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+# Debug config runtime files required for the plugin test mule (Qt image format plugins)
+set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/imageformats")
+set(plugintest_debug_files
+    qgifd4.dll
+    qicod4.dll
+    qjpegd4.dll
+    qmngd4.dll
+    qsvgd4.dll
+    qtiffd4.dll
+    )
+copy_if_different(
+    ${plugintest_debug_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug/imageformats"
+    out_targets
+    ${plugintest_debug_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${plugintest_debug_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/llplugin/imageformats"
+    out_targets
+    ${plugintest_debug_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+# Release & ReleaseDebInfo config runtime files required for the plugin test mule
+set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
+set(plugintest_release_files
+    libeay32.dll
+    libglib-2.0-0.dll
+    libgmodule-2.0-0.dll
+    libgobject-2.0-0.dll
+    libgthread-2.0-0.dll
+    qtcore4.dll
+    qtgui4.dll
+    qtnetwork4.dll
+    qtopengl4.dll
+    qtwebkit4.dll
+    ssleay32.dll
+    )
+copy_if_different(
+    ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+# Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins)
+set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/imageformats")
+set(plugintest_release_files
+    qgif4.dll
+    qico4.dll
+    qjpeg4.dll
+    qmng4.dll
+    qsvg4.dll
+    qtiff4.dll
+    )
+copy_if_different(
+    ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release/imageformats"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo/imageformats"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin/imageformats"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${plugintest_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin/imageformats"
+    out_targets
+    ${plugintest_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+# Debug config runtime files required for the plugins
+set(plugins_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
+set(plugins_debug_files
+    libeay32.dll
+    qtcored4.dll
+    qtguid4.dll
+    qtnetworkd4.dll
+    qtopengld4.dll
+    qtwebkitd4.dll
+    ssleay32.dll
+    )
+copy_if_different(
+    ${plugins_debug_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/Debug/llplugin"
+    out_targets
+    ${plugins_debug_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+# Release & ReleaseDebInfo config runtime files required for the plugins
+set(plugins_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
+set(plugins_release_files
+    libeay32.dll
+    qtcore4.dll
+    qtgui4.dll
+    qtnetwork4.dll
+    qtopengl4.dll
+    qtwebkit4.dll
+    ssleay32.dll
+    )
+copy_if_different(
+    ${plugins_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin"
+    out_targets
+    ${plugins_release_files}
+    )
+set(all_targets ${all_targets} ${out_targets})
+
+copy_if_different(
+    ${plugins_release_src_dir}
+    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin"
+    out_targets
+    ${plugins_release_files}
     )
 set(all_targets ${all_targets} ${out_targets})
 
 set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
 set(release_files
     alut.dll
-    freebl3.dll
-    js3250.dll
-    nspr4.dll
-    nss3.dll
-    nssckbi.dll
     openal32.dll
     openjpeg.dll
     libhunspell.dll
-    plc4.dll
-    plds4.dll
-    smime3.dll
-    softokn3.dll
-    ssl3.dll
-    xpcom.dll
-    xul.dll
-    iconv.dll
-    libxml2.dll
-        libcairo-2.dll
-        libfaad-2.dll
-    libgio-2.0-0.dll
-    libglib-2.0-0.dll
-    libgmodule-2.0-0.dll
-    libgobject-2.0-0.dll
-    libgthread-2.0-0.dll
-        charset.dll
-        intl.dll
-        libgcrypt-11.dll
-        libgnutls-26.dll
-        libgpg-error-0.dll
-        libgstapp.dll
-        libgstaudio.dll
-        libgstaudio-0.10.dll
-        libgstbase-0.10.dll
-        libgstcdda.dll
-        libgstcontroller-0.10.dll
-        libgstdataprotocol-0.10.dll
-        libgstdshow.dll
-        libgstfft.dll
-        libgstinterfaces.dll
-        libgstnet-0.10.dll
-        libgstnetbuffer.dll
-        libgstpbutils.dll
-        libgstreamer-0.10.dll
-        libgstriff.dll
-        libgstrtp.dll
-        libgstrtsp.dll
-        libgstsdp.dll
-        libgsttag.dll
-        libgstvideo.dll
-        libjpeg.dll
-        libmp3lame-0.dll
-        libneon-27.dll
-        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
-        libvorbis-0.dll
-        libvorbisenc-2.dll
-        libxml2-2.dll
-        glew32.dll
-    xvidcore.dll
-    zlib1.dll
     )
     
 copy_if_different(