diff options
| author | Stefan Boberg <[email protected]> | 2024-08-14 17:33:34 +0000 |
|---|---|---|
| committer | Dan Engelbrecht <[email protected]> | 2024-10-10 09:56:40 +0200 |
| commit | 82144f91e116a1933c22931d0f688abe7429fb47 (patch) | |
| tree | 73d2fde66bde4c6947402aac5f641f18735d4e0e /src/zencloud/xmake.lua | |
| parent | more general .gitignore rule for toolchains (diff) | |
| download | zen-sb/cloud.tar.xz zen-sb/cloud.zip | |
tweaked zencloud build rules to work around Linux linker ordering dependenciessb/cloud
Diffstat (limited to 'src/zencloud/xmake.lua')
| -rw-r--r-- | src/zencloud/xmake.lua | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/src/zencloud/xmake.lua b/src/zencloud/xmake.lua index d7f51093c..963148ad9 100644 --- a/src/zencloud/xmake.lua +++ b/src/zencloud/xmake.lua @@ -33,20 +33,47 @@ target("zencloud") add_packages( "vcpkg::aws-sdk-cpp[s3-crt]", - "vcpkg::aws-crt-cpp", + "vcpkg::aws-c-s3", "vcpkg::aws-c-auth", "vcpkg::aws-c-cal", "vcpkg::aws-checksums", - "vcpkg::aws-c-common", "vcpkg::aws-c-compression", "vcpkg::aws-c-event-stream", "vcpkg::aws-c-http", "vcpkg::aws-c-io", "vcpkg::aws-c-mqtt", - "vcpkg::aws-c-s3", - "vcpkg::aws-c-sdkutils" + "vcpkg::aws-crt-cpp", + "vcpkg::aws-c-sdkutils", + "vcpkg::aws-c-common" ) + if is_plat("linux") then + add_packages("vcpkg::s2n") + + add_linkgroups( + "aws-c-s3", + "aws-c-auth", + "aws-c-cal", + "aws-checksums", + "aws-c-compression", + "aws-c-event-stream", + "aws-c-http", + "aws-c-io", + "aws-c-mqtt", + "aws-crt-cpp", + "aws-c-sdkutils", + "aws-c-common", + "aws-cpp-sdk-core", + "aws-cpp-sdk-s3", + "aws-cpp-sdk-s3-crt", + "aws-cpp-sdk-kinesis", + "aws-cpp-sdk-dynamodb", + "s2n", + { name = "aws-c", group = true }) + + add_linkorders("aws-c") + end + if is_plat("windows") then add_links("wininet", "ncrypt", "secur32", "shlwapi", "userenv", "version", "winhttp") -- AWS SDK needs these end |