From 193e87847ad1a7480e89c29d4f19d4c6c9c698a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=95=E3=81=8F=E3=82=89=E3=81=BF=E3=81=93?= Date: Tue, 17 Dec 2024 07:24:44 +0300 Subject: [PATCH] fixup --- include/omath/Angle.hpp | 2 +- include/omath/Color.hpp | 2 +- include/omath/Mat.hpp | 2 +- include/omath/Matrix.hpp | 2 +- include/omath/Triangle3d.hpp | 2 +- include/omath/Vector2.hpp | 2 +- include/omath/Vector3.hpp | 2 +- include/omath/Vector4.hpp | 2 +- include/omath/ViewAngles.hpp | 2 +- include/omath/collision/LineTracer.hpp | 2 +- include/omath/engines/Source/Camera.hpp | 2 +- .../{omath_export.h => omath_export.hpp} | 46 +++++++++---------- include/omath/pathfinding/Astar.hpp | 2 +- include/omath/pathfinding/NavigationMesh.hpp | 2 +- include/omath/prediction/Engine.hpp | 2 +- include/omath/prediction/Projectile.hpp | 2 +- include/omath/prediction/Target.hpp | 2 +- include/omath/projection/Camera.hpp | 2 +- 18 files changed, 40 insertions(+), 40 deletions(-) rename include/omath/{omath_export.h => omath_export.hpp} (95%) diff --git a/include/omath/Angle.hpp b/include/omath/Angle.hpp index 3622a1c..9b66495 100644 --- a/include/omath/Angle.hpp +++ b/include/omath/Angle.hpp @@ -6,7 +6,7 @@ #include "omath/Angles.hpp" #include -#include "omath_export.h" +#include "omath/omath_export.hpp" namespace omath { diff --git a/include/omath/Color.hpp b/include/omath/Color.hpp index cf4644b..19185e8 100644 --- a/include/omath/Color.hpp +++ b/include/omath/Color.hpp @@ -7,7 +7,7 @@ #include "omath/Vector3.hpp" #include #include "omath/Vector4.hpp" -#include "omath_export.h" +#include "omath/omath_export.hpp" namespace omath { diff --git a/include/omath/Mat.hpp b/include/omath/Mat.hpp index 3adb480..2b99de5 100644 --- a/include/omath/Mat.hpp +++ b/include/omath/Mat.hpp @@ -8,7 +8,7 @@ #include #include #include "Vector3.hpp" -#include "omath_export.h" +#include "omath/omath_export.hpp" namespace omath { diff --git a/include/omath/Matrix.hpp b/include/omath/Matrix.hpp index fc1e296..3cac39b 100644 --- a/include/omath/Matrix.hpp +++ b/include/omath/Matrix.hpp @@ -2,7 +2,7 @@ #include #include #include -#include "omath_export.h" +#include "omath/omath_export.hpp" namespace omath { diff --git a/include/omath/Triangle3d.hpp b/include/omath/Triangle3d.hpp index 826e4fc..af94482 100644 --- a/include/omath/Triangle3d.hpp +++ b/include/omath/Triangle3d.hpp @@ -3,7 +3,7 @@ // #pragma once #include "omath/Vector3.hpp" -#include "omath_export.h" +#include "omath/omath_export.hpp" namespace omath { diff --git a/include/omath/Vector2.hpp b/include/omath/Vector2.hpp index a4cf0af..7c49135 100644 --- a/include/omath/Vector2.hpp +++ b/include/omath/Vector2.hpp @@ -5,7 +5,7 @@ #pragma once #include #include -#include "omath_export.h" +#include "omath/omath_export.hpp" namespace omath { diff --git a/include/omath/Vector3.hpp b/include/omath/Vector3.hpp index c0521b3..9b80bc3 100644 --- a/include/omath/Vector3.hpp +++ b/include/omath/Vector3.hpp @@ -7,7 +7,7 @@ #include #include #include "omath/Vector2.hpp" -#include "omath_export.h" +#include "omath/omath_export.hpp" namespace omath { diff --git a/include/omath/Vector4.hpp b/include/omath/Vector4.hpp index 8a3c84f..2a6fc32 100644 --- a/include/omath/Vector4.hpp +++ b/include/omath/Vector4.hpp @@ -5,7 +5,7 @@ #include #include -#include "omath_export.h" +#include "omath/omath_export.hpp" namespace omath { diff --git a/include/omath/ViewAngles.hpp b/include/omath/ViewAngles.hpp index e3ef7a8..164feb4 100644 --- a/include/omath/ViewAngles.hpp +++ b/include/omath/ViewAngles.hpp @@ -3,7 +3,7 @@ // #pragma once -#include "omath_export.h" +#include "omath/omath_export.hpp" namespace omath { diff --git a/include/omath/collision/LineTracer.hpp b/include/omath/collision/LineTracer.hpp index 2c42e60..d067562 100644 --- a/include/omath/collision/LineTracer.hpp +++ b/include/omath/collision/LineTracer.hpp @@ -5,7 +5,7 @@ #include "omath/Vector3.hpp" #include "omath/Triangle3d.hpp" -#include "../omath_export.h" +#include "omath/omath_export.hpp" namespace omath::collision { diff --git a/include/omath/engines/Source/Camera.hpp b/include/omath/engines/Source/Camera.hpp index 4ebe113..b942909 100644 --- a/include/omath/engines/Source/Camera.hpp +++ b/include/omath/engines/Source/Camera.hpp @@ -4,7 +4,7 @@ #pragma once #include "Constants.h" #include "omath/projection/Camera.hpp" -#include "../../omath_export.h" +#include "omath/omath_export.hpp" namespace omath::source { diff --git a/include/omath/omath_export.h b/include/omath/omath_export.hpp similarity index 95% rename from include/omath/omath_export.h rename to include/omath/omath_export.hpp index 091fd56..199e78f 100644 --- a/include/omath/omath_export.h +++ b/include/omath/omath_export.hpp @@ -1,24 +1,24 @@ -#pragma once - -/* Export prefix for functions */ -#ifdef _MSC_VER - /* MSVC */ -# define OMATH_API_EXPORT __declspec(dllexport) -#else - /* GCC/Clang */ -# define OMATH_API_EXPORT __attribute__((visibility("default"))) -#endif - -/* Import prefix for functions */ -#ifdef _MSC_VER -# define OMATH_API_IMPORT __declspec(dllimport) -#else -# define OMATH_API_IMPORT extern -#endif - -/* Resolve import/export */ -#ifdef OMATH_EXPORT -# define OMATH_API OMATH_API_EXPORT -#else -# define OMATH_API OMATH_API_IMPORT +#pragma once + +/* Export prefix for functions */ +#ifdef _MSC_VER + /* MSVC */ +# define OMATH_API_EXPORT __declspec(dllexport) +#else + /* GCC/Clang */ +# define OMATH_API_EXPORT __attribute__((visibility("default"))) +#endif + +/* Import prefix for functions */ +#ifdef _MSC_VER +# define OMATH_API_IMPORT __declspec(dllimport) +#else +# define OMATH_API_IMPORT extern +#endif + +/* Resolve import/export */ +#ifdef OMATH_EXPORT +# define OMATH_API OMATH_API_EXPORT +#else +# define OMATH_API OMATH_API_IMPORT #endif \ No newline at end of file diff --git a/include/omath/pathfinding/Astar.hpp b/include/omath/pathfinding/Astar.hpp index 07d7323..435bd5d 100644 --- a/include/omath/pathfinding/Astar.hpp +++ b/include/omath/pathfinding/Astar.hpp @@ -6,7 +6,7 @@ #include #include "NavigationMesh.hpp" #include "omath/Vector3.hpp" -#include "../omath_export.h" +#include "omath/omath_export.hpp" namespace omath::pathfinding { diff --git a/include/omath/pathfinding/NavigationMesh.hpp b/include/omath/pathfinding/NavigationMesh.hpp index 325fe9d..39cc2ea 100644 --- a/include/omath/pathfinding/NavigationMesh.hpp +++ b/include/omath/pathfinding/NavigationMesh.hpp @@ -8,7 +8,7 @@ #include #include #include -#include "../omath_export.h" +#include "omath/omath_export.hpp" namespace omath::pathfinding { diff --git a/include/omath/prediction/Engine.hpp b/include/omath/prediction/Engine.hpp index d81eea0..c48456c 100644 --- a/include/omath/prediction/Engine.hpp +++ b/include/omath/prediction/Engine.hpp @@ -8,7 +8,7 @@ #include "omath/Vector3.hpp" #include "omath/prediction/Projectile.hpp" #include "omath/prediction/Target.hpp" -#include "../omath_export.h" +#include "omath/omath_export.hpp" namespace omath::prediction { diff --git a/include/omath/prediction/Projectile.hpp b/include/omath/prediction/Projectile.hpp index 51da5ae..51f6ebc 100644 --- a/include/omath/prediction/Projectile.hpp +++ b/include/omath/prediction/Projectile.hpp @@ -4,7 +4,7 @@ #pragma once #include "omath/Vector3.hpp" -#include "../omath_export.h" +#include "omath/omath_export.hpp" namespace omath::prediction { diff --git a/include/omath/prediction/Target.hpp b/include/omath/prediction/Target.hpp index 2f062d0..083d3bd 100644 --- a/include/omath/prediction/Target.hpp +++ b/include/omath/prediction/Target.hpp @@ -4,7 +4,7 @@ #pragma once #include "omath/Vector3.hpp" -#include "../omath_export.h" +#include "omath/omath_export.hpp" namespace omath::prediction { diff --git a/include/omath/projection/Camera.hpp b/include/omath/projection/Camera.hpp index 2254d4c..7a374ba 100644 --- a/include/omath/projection/Camera.hpp +++ b/include/omath/projection/Camera.hpp @@ -10,7 +10,7 @@ #include "ErrorCodes.hpp" #include #include -#include "../omath_export.h" +#include namespace omath::projection {