diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-28 17:38:53 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-28 17:38:53 +0800 |
| commit | 0878aea1c2f7ee03bc293adfbbf0d2a80eeffc50 (patch) | |
| tree | 20f72e61275d3395f644af80297d697c42168453 | |
| parent | 9268fdd5b99bb8e426e7c1232916dfd909039f96 (diff) | |
Install plugins somewhere close to libvlc on macOS
and without having to rename the containing folder.
VLC streaming still hasn't worked (it used to) since using fixup_bundle,
since switching to FMOD, since switching from SDL to Cocoa, since
merging Maintenance B, so still no idea which of these is causing it.
| -rw-r--r-- | indra/media_plugins/libvlc/media_plugin_libvlc.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp index a5d8f885fd..4828befb6b 100644 --- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp +++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp @@ -174,7 +174,7 @@ void MediaPluginLibVLC::initVLC() }; #if LL_DARWIN - setenv("VLC_PLUGIN_PATH", ".", 1); + setenv("VLC_PLUGIN_PATH", "plugins", 1); #endif int vlc_argc = sizeof(vlc_argv) / sizeof(*vlc_argv); diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index cf82044fb8..079af78dcb 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -114,6 +114,11 @@ if (DARWIN) ) install(DIRECTORY + /Applications/VLC.app/Contents/MacOS/plugins + DESTINATION ../Frameworks + ) + + install(DIRECTORY "${AUTOBUILD_INSTALL_DIR}/lib/release/Chromium Embedded Framework.framework" DESTINATION ../Frameworks ) |