From 73e803c7dd63724dd830807232c27d920fd8009b Mon Sep 17 00:00:00 2001 From: Robbe Bryssinck Date: Tue, 3 Jan 2023 21:45:27 +0100 Subject: [PATCH] fix: build errors --- Code/tp_process/main.cpp | 2 +- Libraries/TiltedUI | 2 +- xmake.lua | 13 +++++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Code/tp_process/main.cpp b/Code/tp_process/main.cpp index 73249605f..dc20a0540 100644 --- a/Code/tp_process/main.cpp +++ b/Code/tp_process/main.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include "ProcessHandler.h" int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) diff --git a/Libraries/TiltedUI b/Libraries/TiltedUI index dc14f183f..7f421437a 160000 --- a/Libraries/TiltedUI +++ b/Libraries/TiltedUI @@ -1 +1 @@ -Subproject commit dc14f183fdec1000229d0026bf0e9afa436cef36 +Subproject commit 7f421437a36a49e5d06ca534e1eacf217b84bee7 diff --git a/xmake.lua b/xmake.lua index 3ed91f672..764464012 100644 --- a/xmake.lua +++ b/xmake.lua @@ -45,17 +45,26 @@ add_requires( add_requireconfs("cpp-httplib", {configs = {ssl = true}}) add_requireconfs("sentry-native", { configs = { backend = "crashpad" } }) +--[[ add_requireconfs("magnum", { configs = { sdl2 = true }}) add_requireconfs("magnum-integration", { configs = { imgui = true }}) add_requireconfs("magnum-integration.magnum", { configs = { sdl2 = true }}) add_requireconfs("magnum-integration.imgui", { override = true }) +--]] if is_plat("windows") then add_requires( "discord", - "imgui", + "imgui" + ) + --[[ + add_requires( + "discord", + "imgui", "magnum", - "magnum-integration") + "magnum-integration" + ) + --]] end before_build(function (target)