Remove Config.hpp options and refactor headers
- Rename Config.hpp to Export.hpp - Remove Debug.hpp and DebugOff.hpp (not used anymore)
This commit is contained in:
committed by
Jérôme Leclercq
parent
3c7e2a1685
commit
5130a2ff84
@@ -1,6 +1,6 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
// For conditions of distribution and use, see copyright notice in Export.hpp
|
||||
|
||||
#pragma once
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <Nazara/Core/Color.hpp>
|
||||
#include <Nazara/Math/Rect.hpp>
|
||||
#include <Nazara/Math/Vector2.hpp>
|
||||
#include <Nazara/TextRenderer/Config.hpp>
|
||||
#include <Nazara/TextRenderer/Export.hpp>
|
||||
#include <memory>
|
||||
|
||||
namespace Nz
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
// For conditions of distribution and use, see copyright notice in Export.hpp
|
||||
|
||||
#include <Nazara/TextRenderer/Debug.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
@@ -19,4 +18,3 @@ namespace Nz
|
||||
}
|
||||
}
|
||||
|
||||
#include <Nazara/TextRenderer/DebugOff.hpp>
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifndef NAZARA_TEXTRENDERER_CONFIGCHECK_HPP
|
||||
#define NAZARA_TEXTRENDERER_CONFIGCHECK_HPP
|
||||
|
||||
/// This file is used to check the constant values defined in Config.hpp
|
||||
|
||||
#include <type_traits>
|
||||
#define NazaraCheckTypeAndVal(name, type, op, val, err) static_assert(std::is_ ##type <decltype(name)>::value && name op val, #type err)
|
||||
|
||||
#undef NazaraCheckTypeAndVal
|
||||
|
||||
#endif // NAZARA_TEXTRENDERER_CONFIGCHECK_HPP
|
||||
@@ -1,5 +0,0 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
|
||||
// no header guards
|
||||
@@ -1,5 +0,0 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
|
||||
// no header guards
|
||||
@@ -24,13 +24,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifndef NAZARA_TEXTRENDERER_CONFIG_HPP
|
||||
#define NAZARA_TEXTRENDERER_CONFIG_HPP
|
||||
|
||||
/// Each modification of a parameter needs a recompilation of the module
|
||||
|
||||
// Activate the security tests based on the code (Advised for development)
|
||||
#define NAZARA_TEXTRENDERER_SAFE 1
|
||||
#ifndef NAZARA_TEXTRENDERER_EXPORT_HPP
|
||||
#define NAZARA_TEXTRENDERER_EXPORT_HPP
|
||||
|
||||
#if defined(NAZARA_STATIC)
|
||||
#define NAZARA_TEXTRENDERER_API
|
||||
@@ -42,4 +37,4 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif // NAZARA_TEXTRENDERER_CONFIG_HPP
|
||||
#endif // NAZARA_TEXTRENDERER_EXPORT_HPP
|
||||
@@ -1,6 +1,6 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
// For conditions of distribution and use, see copyright notice in Export.hpp
|
||||
|
||||
///TODO: FontManager ?
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <Nazara/Core/Resource.hpp>
|
||||
#include <Nazara/Core/ResourceLoader.hpp>
|
||||
#include <Nazara/Core/ResourceParameters.hpp>
|
||||
#include <Nazara/TextRenderer/Config.hpp>
|
||||
#include <Nazara/TextRenderer/Export.hpp>
|
||||
#include <memory>
|
||||
#include <unordered_map>
|
||||
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
// For conditions of distribution and use, see copyright notice in Export.hpp
|
||||
|
||||
#include <memory>
|
||||
#include <Nazara/TextRenderer/Debug.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
}
|
||||
|
||||
#include <Nazara/TextRenderer/DebugOff.hpp>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
// For conditions of distribution and use, see copyright notice in Export.hpp
|
||||
|
||||
#pragma once
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <NazaraUtils/Prerequisites.hpp>
|
||||
#include <Nazara/Core/Enums.hpp>
|
||||
#include <Nazara/TextRenderer/Config.hpp>
|
||||
#include <Nazara/TextRenderer/Export.hpp>
|
||||
#include <string>
|
||||
|
||||
namespace Nz
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
// For conditions of distribution and use, see copyright notice in Export.hpp
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
// For conditions of distribution and use, see copyright notice in Export.hpp
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
// For conditions of distribution and use, see copyright notice in Export.hpp
|
||||
|
||||
#include <Nazara/TextRenderer/Debug.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
@@ -166,4 +165,3 @@ namespace Nz
|
||||
}
|
||||
}
|
||||
|
||||
#include <Nazara/TextRenderer/DebugOff.hpp>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
// For conditions of distribution and use, see copyright notice in Export.hpp
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
// For conditions of distribution and use, see copyright notice in Export.hpp
|
||||
|
||||
#include <Nazara/TextRenderer/Debug.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
@@ -620,4 +619,3 @@ namespace Nz
|
||||
}
|
||||
}
|
||||
|
||||
#include <Nazara/TextRenderer/DebugOff.hpp>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
// For conditions of distribution and use, see copyright notice in Export.hpp
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
// For conditions of distribution and use, see copyright notice in Export.hpp
|
||||
|
||||
#include <Nazara/TextRenderer/Debug.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
@@ -381,4 +380,3 @@ namespace Nz
|
||||
}
|
||||
}
|
||||
|
||||
#include <Nazara/TextRenderer/DebugOff.hpp>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Copyright (C) 2024 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Text renderer"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
// For conditions of distribution and use, see copyright notice in Export.hpp
|
||||
|
||||
#pragma once
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <NazaraUtils/Prerequisites.hpp>
|
||||
#include <Nazara/Core/Core.hpp>
|
||||
#include <Nazara/TextRenderer/Config.hpp>
|
||||
#include <Nazara/TextRenderer/Export.hpp>
|
||||
#include <Nazara/TextRenderer/Font.hpp>
|
||||
|
||||
namespace Nz
|
||||
|
||||
Reference in New Issue
Block a user