Auto-update webui to 2.4.2 (#3347)

* Update webui to 2.4.2 * Update xmake.lua * fix syslinks * Update xmake.lua * Update xmake.lua --------- Co-authored-by: star9029 <hengxings783@gmail.com>
9 months ago · e144b32371
parent cc470a3154
commit e144b32371
1 changed files with 17 additions and 9 deletions
--- a/packages/w/webui/xmake.lua
+++ b/packages/w/webui/xmake.lua
@ -1,21 +1,32 @@
 package("webui")
-
    set_homepage("https://webui.me")
    set_description("Use any web browser as GUI, with your preferred language in the backend and HTML5 in the frontend, all in a lightweight portable lib.")
    set_license("MIT")

    set_urls("https://github.com/webui-dev/webui/archive/refs/tags/$(version).tar.gz",
             "https://github.com/webui-dev/webui.git")
+
+    add_versions("2.4.2", "c51967bbab472655d04e28ce1668ee4adda1f320e05f98c14f071b2cdf61228b")
    add_versions("2.3.0", "14be57405b12cf434daade2310178534240866e3169c7213a6fa0e4a6c6f9f27")

    if is_plat("windows") then
-        add_syslinks("user32", "advapi32")
+        add_syslinks("user32", "advapi32", "shell32")
    elseif is_plat("mingw") then
        add_syslinks("ws2_32")
    end

    on_install("windows", "linux", "macosx", "mingw", "msys", "android", "cross", function (package)
-        local configs = {}
+        if package:is_plat("android") and package:is_arch("armeabi-v7a") then
+            import("core.tool.toolchain")
+            local ndk = toolchain.load("ndk", {plat = package:plat(), arch = package:arch()})
+            local ndk_sdkver = ndk:config("ndk_sdkver")
+            if tonumber(ndk_sdkver) < 24 then
+                -- https://github.com/marzer/tomlplusplus/pull/205
+                io.replace("src/civetweb/civetweb.c", "ftello", "ftell", {plain = true})
+                io.replace("src/civetweb/civetweb.c", "fseeko", "fseek", {plain = true})
+            end
+        end
+
        io.writefile("xmake.lua", [[
            add_rules("mode.debug", "mode.release")
            target("webui")
@ -25,15 +36,12 @@ package("webui")
                add_headerfiles("include/webui.h", "include/webui.hpp")
                add_includedirs("include", "src/civetweb")
                if is_plat("windows") then
-                    add_syslinks("user32", "advapi32")
+                    add_syslinks("user32", "advapi32", "shell32")
                elseif is_plat("mingw") then
                    add_syslinks("ws2_32")
                end
        ]])
-        if package:config("shared") then
-            configs.kind = "shared"
-        end
-        import("package.tools.xmake").install(package, configs)
+        import("package.tools.xmake").install(package)
    end)

    on_test(function (package)
@ -44,5 +52,5 @@ package("webui")
                webui_show(my_window, "<html>Hello</html>");
                webui_wait();
            }
-        ]]}))
+        ]]}, {configs = {languages = "c++17"}}))
    end)