diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-10-14 07:32:03 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-10-14 07:32:03 +0800 |
| commit | 46273f40e8116a06bf7460903a1451e88ca2fad4 (patch) | |
| tree | 9b3fdc6b3884c23dc993168cbd991998f28e5fb7 /indra | |
| parent | 82391adeb81656b6b23559c52bf4a3db2c932673 (diff) | |
Not build libvlc on macOS for now
At runtime it hasn't worked anyway. And now we can get an ARM build
without having to build libvlc for ARM first.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 8b1ba4daa5..8c1124214c 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2120,8 +2120,10 @@ if (DARWIN) if (USE_AUTOBUILD_3P OR USE_CONAN) add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc media_plugin_cef) - else () + elseif (NOT DARWIN) add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc) + else () + add_dependencies(${VIEWER_BINARY_NAME} SLPlugin) endif () if (ENABLE_SIGNING) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 3991b069e6..e897edaf48 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -131,12 +131,12 @@ #include "stringize.h" #include "llcoros.h" #include "llexception.h" -//#if !LL_LINUX +#if !LL_DARWIN #ifndef LL_USESYSTEMLIBS #include "cef/dullahan_version.h" #endif #include "vlc/libvlc_version.h" -//#endif // LL_LINUX +#endif // LL_DARWIN #if LL_DARWIN #include "llwindowsdl.h" @@ -3376,7 +3376,7 @@ LLSD LLAppViewer::getViewerInfo() const info["LIBCEF_VERSION"] = "Undefined"; #endif -//#if !LL_LINUX +#if !LL_DARWIN std::ostringstream vlc_ver_codec; vlc_ver_codec << LIBVLC_VERSION_MAJOR; vlc_ver_codec << "."; @@ -3384,11 +3384,9 @@ LLSD LLAppViewer::getViewerInfo() const vlc_ver_codec << "."; vlc_ver_codec << LIBVLC_VERSION_REVISION; info["LIBVLC_VERSION"] = vlc_ver_codec.str(); -/* #else info["LIBVLC_VERSION"] = "Undefined"; #endif -*/ S32 packets_in = LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_IN); if (packets_in > 0) |