diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index e486bb8802..c61f781d9f 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -60,6 +60,9 @@ include(ZLIBNG) include(URIPARSER) include(LLPrimitive) include(LibVLCPlugin) +if (DARWIN) + include(CEFPlugin) +endif () include(UnixInstall) if ((USE_AUTOBUILD_3P OR USE_CONAN) AND NOT HAVOK_TPV) @@ -1955,6 +1958,10 @@ target_link_libraries(${VIEWER_BINARY_NAME} ll::fontconfig ) +if( DARWIN ) + target_link_libraries(${VIEWER_BINARY_NAME} ll::cef ) +endif() + if( TARGET ll::intel_memops ) target_link_libraries(${VIEWER_BINARY_NAME} ll::intel_memops ) endif() @@ -2137,7 +2144,7 @@ if (DARWIN) ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ) - if (USE_AUTOBUILD_3P OR USE_CONAN) + if (DARWIN) add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc media_plugin_cef) else () add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 2108461e9b..377648bdae 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -132,12 +132,10 @@ #include "stringize.h" #include "llcoros.h" #include "llexception.h" -//#if !LL_LINUX -#ifndef LL_USESYSTEMLIBS +#if LL_DARWIN #include "cef/dullahan_version.h" #endif #include "vlc/libvlc_version.h" -//#endif // LL_LINUX #if LL_DARWIN #include "llwindowsdl.h" @@ -3366,8 +3364,7 @@ LLSD LLAppViewer::getViewerInfo() const info["VOICE_VERSION"] = LLTrans::getString("NotConnected"); } -//#if !LL_LINUX && !LL_FREEBSD && !LL_DARWIN -#ifndef LL_USESYSTEMLIBS +#if LL_DARWIN std::ostringstream cef_ver_codec; cef_ver_codec << "Dullahan: "; cef_ver_codec << DULLAHAN_VERSION_MAJOR; |