diff options
| author | Callum Prentice <callum@lindenlab.com> | 2016-06-02 14:00:36 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2016-06-02 14:00:36 -0700 |
| commit | a24e24fb50e2bbf0a73ccd53ff2ba64124dabeba (patch) | |
| tree | 526dc07621a65fd46c635ed875145a30c9e21432 /indra/cmake | |
| parent | 4796f717c2a2c5756b91fa5281019ff23a10a613 (diff) | |
| parent | 336121312b9ea30fcc46a033f3b6c4b23358ab1b (diff) | |
Merged in NickyD/viewer-release-vlc (pull request #2)
Linux media_plugin_libvlc
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/LLWindow.cmake | 2 | ||||
| -rw-r--r-- | indra/cmake/LibVLCPlugin.cmake | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake index ba07a80f05..80af7ff2ab 100644 --- a/indra/cmake/LLWindow.cmake +++ b/indra/cmake/LLWindow.cmake @@ -18,7 +18,7 @@ else (USESYSTEMLIBS) use_prebuilt_binary(SDL) set (SDL_FOUND TRUE) set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux) - set (SDL_LIBRARY SDL directfb fusion direct) + set (SDL_LIBRARY SDL directfb fusion direct X11) endif (LINUX) endif (USESYSTEMLIBS) 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) |