From 5e643bca7b5d6f9554a8e8ba54b5cb1db09d1eb1 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Wed, 15 Nov 2023 08:06:50 +0100 Subject: [PATCH] Fix MinGW compilation --- include/Nazara/Core/ParameterFile.hpp | 4 ++-- src/Nazara/Core/ParameterFile.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/Nazara/Core/ParameterFile.hpp b/include/Nazara/Core/ParameterFile.hpp index cc4330426..a20625f4e 100644 --- a/include/Nazara/Core/ParameterFile.hpp +++ b/include/Nazara/Core/ParameterFile.hpp @@ -43,8 +43,8 @@ namespace Nz struct Array_t {}; struct OptionalBlock_t {}; - static constexpr inline Array_t Array{}; - static constexpr inline OptionalBlock_t OptionalBlock{}; + static constexpr Array_t Array{}; + static constexpr OptionalBlock_t OptionalBlock{}; private: using ValueHandler = std::function; diff --git a/src/Nazara/Core/ParameterFile.cpp b/src/Nazara/Core/ParameterFile.cpp index 7ec181516..93b8681d5 100644 --- a/src/Nazara/Core/ParameterFile.cpp +++ b/src/Nazara/Core/ParameterFile.cpp @@ -107,4 +107,8 @@ namespace Nz throw std::runtime_error("unfinished string"); } + + // Required for MinGW (it tris to import those symbols, probably a bug) + constexpr ParameterFile::Array_t ParameterFile::Array; + constexpr ParameterFile::OptionalBlock_t ParameterFile::OptionalBlock; }