Enabled gstreamer10 media plugin in CMake for Windows

2 files changed, 20 insertions, 14 deletions

diff --git a/linden/indra/media_plugins/CMakeLists.txt b/linden/indra/media_plugins/CMakeLists.txt
index a4c6b18..7c224b4 100755
--- a/linden/indra/media_plugins/CMakeLists.txt
+++ b/linden/indra/media_plugins/CMakeLists.txt
@@ -8,8 +8,14 @@ if (LINUX)
     add_subdirectory(gstreamer010)
 endif (LINUX)
 
-if (WINDOWS OR DARWIN)
+# We use gstreamer for audio, quicktime for media on win-- MC
+if (WINDOWS)
+    add_subdirectory(gstreamer010)
+    add_subdirectory(quicktime)
+endif (WINDOWS)
+
+if (DARWIN)
     add_subdirectory(quicktime)
-endif (WINDOWS OR DARWIN)
+endif (DARWIN)
 
 add_subdirectory(example)
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 0eb5b41..dedced0 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1373,7 +1373,7 @@ if (WINDOWS)
         DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
         )
 
-    add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit) # Removed media_plugin_gstreamer010
+    add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit media_plugin_gstreamer010)
 
     if (PACKAGE)
       add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
@@ -1589,17 +1589,17 @@ if (WINDOWS)
         COMMENT "Copying WebKit Plugin to the runtime folder."
         )
         
-   #get_target_property(BUILT_GSTREAMER_PLUGIN media_plugin_gstreamer010 LOCATION)
-   # add_custom_command(
-   #     TARGET ${VIEWER_BINARY_NAME} POST_BUILD
-   #     COMMAND ${CMAKE_COMMAND}
-   #     ARGS
-   #       -E
-   #       copy_if_different
-   #       ${BUILT_GSTREAMER_PLUGIN}
-   #       ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
-   #     COMMENT "Copying Gstreamer Plugin to the runtime folder."
-   #     )
+   get_target_property(BUILT_GSTREAMER_PLUGIN media_plugin_gstreamer010 LOCATION)
+     add_custom_command(
+        TARGET ${VIEWER_BINARY_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND}
+        ARGS
+          -E
+          copy_if_different
+          ${BUILT_GSTREAMER_PLUGIN}
+          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
+        COMMENT "Copying Gstreamer Plugin to the runtime folder."
+        )
         
   get_target_property(BUILT_QUICKTIME_PLUGIN media_plugin_quicktime LOCATION)
     add_custom_command(