diff options
| author | Stefan Boberg <[email protected]> | 2023-10-12 13:45:43 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-10-12 13:45:43 +0200 |
| commit | 91c43f3f3790302639d57a717f996ee133deb523 (patch) | |
| tree | 5d37d19f784c009c1d1b39742211fffee769e6d1 | |
| parent | added logging utility functions (from sb/proto) (#469) (diff) | |
| download | zen-91c43f3f3790302639d57a717f996ee133deb523.tar.xz zen-91c43f3f3790302639d57a717f996ee133deb523.zip | |
restructured transports SDK for easier UE integration (#470)
| -rw-r--r-- | src/transports/transport-sdk/include/transportplugin.h (renamed from src/plugins/include/transportplugin.h) | 0 | ||||
| -rw-r--r-- | src/transports/transport-sdk/xmake.lua (renamed from src/plugins/xmake.lua) | 4 | ||||
| -rw-r--r-- | src/transports/winsock/winsock.cpp (renamed from src/plugins/winsock/winsock.cpp) | 0 | ||||
| -rw-r--r-- | src/transports/winsock/xmake.lua (renamed from src/plugins/winsock/xmake.lua) | 2 | ||||
| -rw-r--r-- | src/transports/xmake.lua | 10 | ||||
| -rw-r--r-- | src/zenhttp/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake.lua | 6 |
7 files changed, 15 insertions, 9 deletions
diff --git a/src/plugins/include/transportplugin.h b/src/transports/transport-sdk/include/transportplugin.h index aee5b2e7a..aee5b2e7a 100644 --- a/src/plugins/include/transportplugin.h +++ b/src/transports/transport-sdk/include/transportplugin.h diff --git a/src/plugins/xmake.lua b/src/transports/transport-sdk/xmake.lua index 9e4d49685..60387c26f 100644 --- a/src/plugins/xmake.lua +++ b/src/transports/transport-sdk/xmake.lua @@ -1,7 +1,7 @@ -- Copyright Epic Games, Inc. All Rights Reserved. -target('plugins') +target('transport-sdk') set_kind("headeronly") - set_group("plugins") + set_group("transports") add_headerfiles("**.h") add_includedirs("include", {public=true}) diff --git a/src/plugins/winsock/winsock.cpp b/src/transports/winsock/winsock.cpp index a6cfed1e3..a6cfed1e3 100644 --- a/src/plugins/winsock/winsock.cpp +++ b/src/transports/winsock/winsock.cpp diff --git a/src/plugins/winsock/xmake.lua b/src/transports/winsock/xmake.lua index 408a248b1..9f9a32daf 100644 --- a/src/plugins/winsock/xmake.lua +++ b/src/transports/winsock/xmake.lua @@ -7,7 +7,7 @@ target("winsock") add_links("Ws2_32") add_includedirs(".", "../../zencore/include") set_symbols("debug") - add_deps("plugins") + add_deps("transport-sdk") if is_mode("release") then set_optimize("fastest") diff --git a/src/transports/xmake.lua b/src/transports/xmake.lua new file mode 100644 index 000000000..44800a8af --- /dev/null +++ b/src/transports/xmake.lua @@ -0,0 +1,10 @@ +-- Copyright Epic Games, Inc. All Rights Reserved. + +set_warnings("allextra", "error") +set_languages("cxx20") + +includes('transport-sdk') + +if is_plat("windows") then + includes("winsock") +end diff --git a/src/zenhttp/xmake.lua b/src/zenhttp/xmake.lua index 9c3869911..588fd8b87 100644 --- a/src/zenhttp/xmake.lua +++ b/src/zenhttp/xmake.lua @@ -7,7 +7,7 @@ target('zenhttp') add_files("**.cpp") add_files("httpsys.cpp", {unity_ignored=true}) add_includedirs("include", {public=true}) - add_deps("zencore", "plugins") + add_deps("zencore", "transport-sdk") add_packages( "vcpkg::cpr", "vcpkg::curl", -- required by cpr @@ -148,7 +148,7 @@ set_languages("cxx20") -- always generate debug information set_symbols("debug") -includes("src/plugins") +includes("src/transports") includes("src/zencore", "src/zencore-test") includes("src/zenhttp") includes("src/zenstore", "src/zenstore-test") @@ -158,10 +158,6 @@ includes("src/zenserver", "src/zenserver-test") includes("src/zen") includes("src/zentest-appstub") -if is_plat("windows") then - includes("src/plugins/winsock") -end - task("bundle") set_menu { usage = "xmake bundle", |