summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorcallum_linden <none@none>2016-05-13 16:43:18 -0700
committercallum_linden <none@none>2016-05-13 16:43:18 -0700
commit09e68a49535a15f89b2c28e523a81fed1770ee61 (patch)
tree4b5f105aaaa7211aab231e4613b442064d0f0c3a /indra/cmake
parent50f311fa75cd680d1f05f0bf767791fba6f0578c (diff)
Additional set of changes to use vlc-bin package
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/LibVLCPlugin.cmake6
1 files changed, 6 insertions, 0 deletions
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)