macOS internal web browser

Just untar Dullahan package manually in prebuilt libs dir.

5 files changed, 13 insertions, 17 deletions

diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake
index 9b77becf29..c38da3de64 100644
--- a/indra/cmake/CEFPlugin.cmake
+++ b/indra/cmake/CEFPlugin.cmake
@@ -6,7 +6,7 @@ include_guard()
 add_library( ll::cef INTERFACE IMPORTED )
 
 use_prebuilt_binary(dullahan)
-target_include_directories( ll::cef SYSTEM INTERFACE  ${LIBS_PREBUILT_DIR}/include/cef)
+target_include_directories( ll::cef SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include ${LIBS_PREBUILT_DIR}/include/cef)
 
 if (WINDOWS)
     target_link_libraries( ll::cef INTERFACE
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index e0b3f6ef56..14d0ea18cf 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -33,10 +33,8 @@
 #include "llpluginmessageclasses.h"
 #include "llcontrol.h"
 
-#ifndef LL_USESYSTEMLIBS
-extern LLControlGroup gSavedSettings;
-#endif
 #if LL_DARWIN
+extern LLControlGroup gSavedSettings;
 extern BOOL gHiDPISupport;
 #endif
 
@@ -936,7 +934,7 @@ void LLPluginClassMedia::setUserDataPath(const std::string &user_data_path_cache
     message.setValue("username", username); // cef shares cache between users but creates user-based contexts
 	message.setValue("cef_log_file", user_data_path_cef_log);
 
-#ifndef LL_USESYSTEMLIBS
+#if LL_DARWIN
 	bool cef_verbose_log = gSavedSettings.getBOOL("CefVerboseLog");
 	message.setValueBoolean("cef_verbose_log", cef_verbose_log);
 #endif
diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt
index 726ccf90ed..972bb7dd2d 100644
--- a/indra/media_plugins/CMakeLists.txt
+++ b/indra/media_plugins/CMakeLists.txt
@@ -2,12 +2,6 @@
 
 add_subdirectory(base)
 
-if (NOT (USE_AUTOBUILD_3P OR USE_CONAN))
-    add_subdirectory(libvlc)
-    add_subdirectory(example)
-    return()
-endif ()
-
 if (LINUX)
     #add_subdirectory(gstreamer010)
     add_subdirectory(example)
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;