From 4f219f46eec9ecab33dea27b8b9da5f697ad86c6 Mon Sep 17 00:00:00 2001 From: Aliaksandr Kalenik Date: Fri, 29 Nov 2024 19:26:57 +0100 Subject: [PATCH] LibWeb: Add ANGLE ANGLE is going to be used for WebGL implementation in upcoming changes. --- Libraries/LibWeb/CMakeLists.txt | 11 +++++++++++ vcpkg.json | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index 6ff3a5fc6d3..525ca311170 100644 --- a/Libraries/LibWeb/CMakeLists.txt +++ b/Libraries/LibWeb/CMakeLists.txt @@ -2,6 +2,10 @@ include(libweb_generators) include(vulkan) include(skia) +if (APPLE) + find_package(unofficial-angle REQUIRED CONFIG) +endif() + set(SOURCES Animations/Animatable.cpp Animations/Animation.cpp @@ -873,6 +877,13 @@ serenity_lib(LibWeb web) target_link_libraries(LibWeb PRIVATE LibCore LibCompress LibCrypto LibJS LibHTTP LibGfx LibIPC LibRegex LibSyntax LibTextCodec LibUnicode LibMedia LibWasm LibXML LibIDL LibURL LibTLS LibRequests LibGC skia) +if (APPLE) + target_link_libraries(LibWeb PRIVATE unofficial::angle::libEGL unofficial::angle::libGLESv2) +endif() + +# FIXME: https://github.com/microsoft/vcpkg/issues/42324 +target_include_directories(LibWeb PRIVATE ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include) + generate_js_bindings(LibWeb) if (ENABLE_SWIFT) diff --git a/vcpkg.json b/vcpkg.json index e089346d51c..805d51a95e6 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,10 @@ { "builtin-baseline": "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c", "dependencies": [ + { + "name": "angle", + "platform": "osx" + }, { "name": "curl", "features": [ @@ -118,6 +122,10 @@ "woff2" ], "overrides": [ + { + "name": "angle", + "version": "chromium_5414#9" + }, { "name": "curl", "version": "8.10.1#0"