diff options
Diffstat (limited to 'src/zenhttp')
| -rw-r--r-- | src/zenhttp/xmake.lua | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/zenhttp/xmake.lua b/src/zenhttp/xmake.lua index 7b49bace1..78876d21b 100644 --- a/src/zenhttp/xmake.lua +++ b/src/zenhttp/xmake.lua @@ -8,27 +8,9 @@ target('zenhttp') add_files("servers/httpsys.cpp", {unity_ignored=true}) add_includedirs("include", {public=true}) add_deps("zencore", "zentelemetry", "transport-sdk", "asio", "cpr") - add_packages( - "vcpkg::curl", -- required by cpr - "vcpkg::openssl", -- required by curl - "vcpkg::zlib", -- required by curl - "vcpkg::gsl-lite", - "vcpkg::http-parser" - ) + add_packages("http_parser", "json11") add_options("httpsys") if is_plat("linux") then - -- The 'vcpkg::openssl' package is two libraries; ssl and crypto, with - -- ssl being dependent on symbols in crypto. When GCC-like linkers read - -- object files from their command line, those object files only resolve - -- symbols of objects previously encountered. Thus crypto must appear - -- after ssl so it can fill out ssl's unresolved symbol table. Xmake's - -- vcpkg support is basic and works by parsing .list files. Openssl's - -- archives are listed alphabetically causing crypto to be _before_ ssl - -- and resulting in link errors. The links are restated here to force - -- xmake to use the correct order, and "syslinks" is used to force the - -- arguments to the end of the line (otherwise they can appear before - -- curl and cause more errors). - add_syslinks("crypto") - add_syslinks("dl") + add_syslinks("dl") -- TODO: is libdl needed? end |