From 5444e4186ed085c210e4a357a25c48ed6ab6eee0 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Fri, 4 Aug 2023 16:40:46 +0200 Subject: [PATCH] Core/Thread: Remove MinGW compiler defines (as they are now part of NazaraUtils) --- src/Nazara/Core/Win32/ThreadImpl.hpp | 13 ------------- xmake.lua | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/Nazara/Core/Win32/ThreadImpl.hpp b/src/Nazara/Core/Win32/ThreadImpl.hpp index 0afd14929..7d5f918d9 100644 --- a/src/Nazara/Core/Win32/ThreadImpl.hpp +++ b/src/Nazara/Core/Win32/ThreadImpl.hpp @@ -10,19 +10,6 @@ #include #include -// Try to identify MinGW thread flavor -#ifdef NAZARA_COMPILER_MINGW - -#if defined(__USING_MCFGTHREAD__) -#define NAZARA_COMPILER_MINGW_THREADS_MCF -#elif defined(_REENTRANT) -#define NAZARA_COMPILER_MINGW_THREADS_POSIX -#else -#define NAZARA_COMPILER_MINGW_THREADS_WIN32 -#endif - -#endif - #ifdef NAZARA_COMPILER_MINGW_THREADS_POSIX #include #else diff --git a/xmake.lua b/xmake.lua index 63d06b62e..76637233f 100644 --- a/xmake.lua +++ b/xmake.lua @@ -248,7 +248,7 @@ end add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo") -add_requires("entt 3.12.2", "fmt", "frozen", "nazarautils") +add_requires("entt 3.12.2", "fmt", "frozen", "nazarautils >=2023.08.04") -- Module dependencies if has_config("audio") then