Skip to content

Commit 89a62d6

Browse files
authored
Update CEF to 141.0.11 (#8487)
* Update CEF to 124.3.9 * Update CEF's C++ version to 17 * Set C++17 in assert * Filter out arm * 141.0.11 * Unicode defines * trailing comma * Unicode defines 2 * Unicode defines 3
1 parent cb5e61b commit 89a62d6

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

packages/c/cef/port/xmake.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ target("cef_dll_wrapper")
44
add_files("libcef_dll/**.cc|ctocpp/test/**.cc|cpptoc/test/**.cc")
55
add_includedirs(".")
66
add_headerfiles("include/(**.h)")
7-
add_defines("WRAPPING_CEF_SHARED")
8-
set_languages("c++14")
7+
add_defines("WRAPPING_CEF_SHARED", "UNICODE", "_UNICODE")
8+
set_languages("c++17")
99
if is_plat("windows") then
1010
-- fix std::max conflict with windows.h
1111
add_defines("NOMINMAX")

packages/c/cef/xmake.lua

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@ package("cef")
1111
["91.1.22"] = "91.1.22+gc67b5dd+chromium-91.0.4472.124",
1212
["97.1.9"] = "97.1.9+ga00bca5+chromium-97.0.4692.99",
1313
["100.0.23"] = "100.0.23+ga1e2187+chromium-100.0.4896.127",
14-
["100.0.24"] = "100.0.24+g0783cf8+chromium-100.0.4896.127"
14+
["100.0.24"] = "100.0.24+g0783cf8+chromium-100.0.4896.127",
15+
["141.0.11"] = "141.0.11+g7e73ac4+chromium-141.0.7390.123",
1516
}
1617

1718
if is_plat("windows") then
1819
add_urls("https://cef-builds.spotifycdn.com/cef_binary_$(version).tar.bz2", {version = function (version)
1920
return format("%s_windows%s", buildver[tostring(version)], (is_arch("x64") and "64" or "32"))
2021
end})
2122
if is_arch("x64") then
23+
add_versions("141.0.11", "bc115f929ec5ab107e62cd67d833da299c856177d8a63c8662c977f741c93157")
2224
add_versions("100.0.24", "c16329ff3beff7ab383d93fe5785eafe83dc3c0b34992cf28c59b0aa3f6fc7ec")
2325
add_versions("100.0.23", "6ba279186f5dc3487f1f89facdeaaa81efcdea90d8a8c4a89273e10262593fa1")
2426
add_versions("97.1.9", "b5f788df517aeac2b86d264440d26eec5c1eb803e66cf1f7cf38cabca3af6fa5")
@@ -27,6 +29,7 @@ package("cef")
2729
add_versions("88.2.9", "86c01e38e7b7d59fed8a1e1ab2c3bfbcc1db42e21f8a6e6feb4061b2af7b1b7d")
2830
add_versions("88.2.1", "8ed01da6327258536c61ada46e14157149ce727e7729ec35a30b91b3ad3cf555")
2931
else
32+
add_versions("141.0.11", "4ece426f5103291175839cd87944d9a405cc02c946d82154838cc0e95f27a011")
3033
add_versions("100.0.24", "ac26164edc67988d53c6e78dd19f42b429ac9ff4a3b197d9f2b416e8e0ace07c")
3134
add_versions("100.0.23", "93febdee82776122b982b1f620d74ce5572a5b7b75d882384634ede947a5b751")
3235
add_versions("97.1.9", "10c0af4b939b3ec6e0f072c2e3c15a044e20b8d42c799ee13a2730ac26dc0908")
@@ -47,7 +50,8 @@ package("cef")
4750
end
4851
add_includedirs(".", "include")
4952

50-
on_install("windows", function (package)
53+
-- TODO: add support for arm
54+
on_install("windows|x86", "windows|x64", function (package)
5155
local distrib_type = package:debug() and "Debug" or "Release"
5256
os.cp(path.join(distrib_type, "*.lib"), package:installdir("lib"))
5357
os.cp(path.join(distrib_type, "*.dll"), package:installdir("bin"))
@@ -59,5 +63,5 @@ package("cef")
5963
end)
6064

6165
on_test(function (package)
62-
assert(package:has_cxxfuncs("CefEnableHighDPISupport", {includes = "cef_app.h"}))
66+
assert(package:has_cxxfuncs("CefShutdown", {includes = "cef_app.h", configs = {languages = "c++17"}}))
6367
end)

0 commit comments

Comments
 (0)