Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
tweak: move all requires to the root xmake.lua and use docking branch…
… of imgui (ci skip)
  • Loading branch information
Yamashi committed May 29, 2022
commit 65623a4769ad6694f4fac22d08e506c7c627cdd0
3 changes: 1 addition & 2 deletions Code/admin/xmake.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
add_requires("magnum", { configs = { sdl2 = true }})
add_requires("magnum-integration", { configs = { imgui = true }})


target("Admin")
set_kind("binary")
Expand Down
2 changes: 0 additions & 2 deletions Code/components/crash_handler/xmake.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
add_requires("sentry-native", { configs = { backend = "crashpad" } })

component("CrashHandler")
add_packages("sentry-native")
2 changes: 0 additions & 2 deletions Code/components/es_loader/xmake.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
add_requires("zlib")

component("ESLoader")
set_pcxxheader("stdafx.h")
add_headerfiles("stdafx.h", {prefixdir = "ESLoader"})
Expand Down
2 changes: 0 additions & 2 deletions Code/immersive_launcher/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ local function build_launcher()
"sentry-native")
end

add_requires("sentry-native")

target("SkyrimImmersiveLauncher")
set_basename("SkyrimTogether")
add_defines(
Expand Down
2 changes: 0 additions & 2 deletions Code/xmake.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
add_requires("glm")

if is_plat("windows") then
includes("client")
includes("immersive_elf")
Expand Down
16 changes: 0 additions & 16 deletions Libraries/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,7 @@
lib_dir = os.curdir()
directx_dir = lib_dir .. "/DXSDK"

add_requireconfs("cpp-httplib", {configs = {ssl = true}})
add_requires(
"tiltedcore",
"cryptopp",
"spdlog",
"cpp-httplib",
"gtest",
"mem")

-- all libraries listed here are under frequent change, and are thus not quired via
-- the xmake package manager, we intend to change this in the future though.

if is_plat("windows") then
add_requires(
"discord",
"imgui")

includes("./TiltedUI")
includes("./TiltedReverse")
includes("./TiltedHooks")
Expand Down
40 changes: 39 additions & 1 deletion xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,45 @@ if has_config("unitybuild") then
add_rules("c++.unity_build", {batchsize = 12})
end

add_requires("entt", "recastnavigation")
package("magnum-integration-docking")
set_base("magnum-integration")
on_load("windows", "linux", "macosx", function (package)
local configdeps = {bullet = "bullet3",
eigen = "eigen3",
glm = "glm",
imgui = "imgui v1.87-docking"}
for config, dep in pairs(configdeps) do
if package:config(config) then
package:add("deps", dep)
end
end
end)
package_end()

add_requires(
"entt",
"recastnavigation",
"tiltedcore",
"cryptopp",
"spdlog",
"cpp-httplib",
"gtest",
"mem",
"glm",
"sentry-native",
"magnum",
"magnum-integration-docking",
"zlib")

add_requireconfs("cpp-httplib", {configs = {ssl = true}})
add_requireconfs("sentry-native", { configs = { backend = "crashpad" } })
add_requireconfs("magnum", { configs = { sdl2 = true }})
add_requireconfs("magnum-integration-docking", { configs = { imgui = true }})
add_requireconfs("magnum-integration-docking.magnum", { configs = { sdl2 = true }})

if is_plat("windows") then
add_requires("discord", "imgui v1.87-docking")
end

before_build(function (target)
import("modules.version")
Expand Down