From eb4629947ef36070a471ff3490a9926d0845c53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 16 Mar 2022 08:25:19 +0100 Subject: [PATCH] Minor fixes --- src/Nazara/Core/AntiWindows.hpp | 2 ++ src/Nazara/Core/AntiX11.hpp | 2 ++ xmake.lua | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Nazara/Core/AntiWindows.hpp b/src/Nazara/Core/AntiWindows.hpp index 886f7409a..38f79bb9d 100644 --- a/src/Nazara/Core/AntiWindows.hpp +++ b/src/Nazara/Core/AntiWindows.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #ifndef _WINDOWS_ #error This header should only be included after including windows.h directly or indirectly in a .cpp #endif diff --git a/src/Nazara/Core/AntiX11.hpp b/src/Nazara/Core/AntiX11.hpp index 0c43a7299..74c4ce15c 100644 --- a/src/Nazara/Core/AntiX11.hpp +++ b/src/Nazara/Core/AntiX11.hpp @@ -2,6 +2,8 @@ // This file is part of the "Nazara Engine - Core module" // For conditions of distribution and use, see copyright notice in Config.hpp +// no header guards + #ifndef _X11_XLIB_H_ #error This header should only be included after including X11/Xlib.h directly or indirectly in a .cpp #endif diff --git a/xmake.lua b/xmake.lua index f1b84fd6b..06f2acdaa 100644 --- a/xmake.lua +++ b/xmake.lua @@ -56,7 +56,7 @@ local modules = { }, Physics2D = { Deps = {"NazaraUtility"}, - Packages = {"chipmunk2d"} + Packages = {"entt", "chipmunk2d"} }, Physics3D = { Deps = {"NazaraUtility"}, @@ -217,7 +217,7 @@ for name, module in pairs(modules) do if has_config("unitybuild") then add_defines("NAZARA_UNITY_BUILD") - add_rules("c++.unity_build", {uniqueid = "NAZARA_UNITY_ID"}) + add_rules("c++.unity_build", {uniqueid = "NAZARA_UNITY_ID", batchsize = 12}) end add_defines("NAZARA_BUILD")