From bd4cf8e2642a525f2c90a456085e27b77fcffcfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sun, 20 Mar 2022 10:52:19 +0100 Subject: [PATCH] macOS fixes --- include/Nazara/Renderer/RenderImage.hpp | 1 + xmake.lua | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/Nazara/Renderer/RenderImage.hpp b/include/Nazara/Renderer/RenderImage.hpp index 74da25b3a..2e62bb004 100644 --- a/include/Nazara/Renderer/RenderImage.hpp +++ b/include/Nazara/Renderer/RenderImage.hpp @@ -11,6 +11,7 @@ #include #include #include +#include namespace Nz { diff --git a/xmake.lua b/xmake.lua index f69b0aeee..aacf24ded 100644 --- a/xmake.lua +++ b/xmake.lua @@ -133,12 +133,16 @@ option_end() set_project("NazaraEngine") set_xmakever("2.6.3") -add_requires("chipmunk2d", "dr_wav", "efsw", "entt >=3.9", "kiwisolver", "libflac", "libsdl", "libx11", "minimp3", "stb") +add_requires("chipmunk2d", "dr_wav", "efsw", "entt >=3.9", "kiwisolver", "libflac", "libsdl", "minimp3", "stb") add_requires("freetype", { configs = { bzip2 = true, png = true, woff2 = true, zlib = true, debug = is_mode("debug") } }) add_requires("libvorbis", { configs = { with_vorbisenc = false } }) add_requires("openal-soft", { configs = { shared = true }}) add_requires("newtondynamics", { debug = is_plat("windows") and is_mode("debug") }) -- Newton doesn't like compiling in Debug on Linux +if is_plat("macosx") then + add_requires("libx11") +end + add_rules("mode.asan", "mode.coverage", "mode.debug", "mode.releasedbg") add_rules("plugin.vsxmake.autoupdate") add_rules("build_rendererplugins")