From e11ab0240a0262fd722f04f104eabbf3949a8cef Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 6 May 2016 17:43:47 -0700
Subject: Moving to a private repo

---
 indra/cmake/LibVLCPlugin.cmake | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 indra/cmake/LibVLCPlugin.cmake

(limited to 'indra/cmake/LibVLCPlugin.cmake')

diff --git a/indra/cmake/LibVLCPlugin.cmake b/indra/cmake/LibVLCPlugin.cmake
new file mode 100644
index 0000000000..286a8d8d1b
--- /dev/null
+++ b/indra/cmake/LibVLCPlugin.cmake
@@ -0,0 +1,16 @@
+# -*- cmake -*-
+include(Linking)
+include(Prebuilt)
+
+if (USESYSTEMLIBS)
+    set(LIBVLCPLUGIN OFF CACHE BOOL
+        "LIBVLCPLUGIN support for the llplugin/llmedia test apps.")
+else (USESYSTEMLIBS)
+    set(LIBVLCPLUGIN ON CACHE BOOL
+        "LIBVLCPLUGIN support for the llplugin/llmedia test apps.")
+endif (USESYSTEMLIBS)
+
+if (WINDOWS)
+elseif (DARWIN)
+elseif (LINUX)
+endif (WINDOWS)
-- 
cgit v1.2.3


From 09e68a49535a15f89b2c28e523a81fed1770ee61 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 13 May 2016 16:43:18 -0700
Subject: Additional set of changes to use vlc-bin package

---
 indra/cmake/LibVLCPlugin.cmake | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/cmake/LibVLCPlugin.cmake')

diff --git a/indra/cmake/LibVLCPlugin.cmake b/indra/cmake/LibVLCPlugin.cmake
index 286a8d8d1b..0d2c46bac0 100644
--- a/indra/cmake/LibVLCPlugin.cmake
+++ b/indra/cmake/LibVLCPlugin.cmake
@@ -6,11 +6,17 @@ if (USESYSTEMLIBS)
     set(LIBVLCPLUGIN OFF CACHE BOOL
         "LIBVLCPLUGIN support for the llplugin/llmedia test apps.")
 else (USESYSTEMLIBS)
+    use_prebuilt_binary(vlc-bin)
     set(LIBVLCPLUGIN ON CACHE BOOL
         "LIBVLCPLUGIN support for the llplugin/llmedia test apps.")
+        set(VLC_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/vlc)
 endif (USESYSTEMLIBS)
 
 if (WINDOWS)
+    set(VLC_PLUGIN_LIBRARIES
+        libvlc.lib
+        libvlccore.lib
+    )
 elseif (DARWIN)
 elseif (LINUX)
 endif (WINDOWS)
-- 
cgit v1.2.3


From bebfe34aac9b217a807baea8fc78ab20c0c94045 Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Wed, 1 Jun 2016 22:33:30 +0200
Subject: Linux: Use media_plugin_libvlc for media playback.

---
 indra/cmake/LibVLCPlugin.cmake | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/cmake/LibVLCPlugin.cmake')

diff --git a/indra/cmake/LibVLCPlugin.cmake b/indra/cmake/LibVLCPlugin.cmake
index 0d2c46bac0..4472676fb4 100644
--- a/indra/cmake/LibVLCPlugin.cmake
+++ b/indra/cmake/LibVLCPlugin.cmake
@@ -19,4 +19,9 @@ if (WINDOWS)
     )
 elseif (DARWIN)
 elseif (LINUX)
+    # Specify a full path to make sure we get a static link
+    set(VLC_PLUGIN_LIBRARIES
+        ${LIBS_PREBUILT_DIR}/lib/libvlc.a
+        ${LIBS_PREBUILT_DIR}/lib/libvlccore.a
+    )
 endif (WINDOWS)
-- 
cgit v1.2.3