From cfa12eb86515cabca60441dfaf6579c5089050f4 Mon Sep 17 00:00:00 2001 From: Kah Wei Date: Tue, 13 Sep 2022 20:28:34 +0800 Subject: [PATCH] Added NOMINMAX to SHADE_Managed --- SHADE_Managed/premake5.lua | 6 ++++++ SHADE_Managed/src/Math/Vector2.cxx | 3 --- SHADE_Managed/src/Math/Vector2.hxx | 4 ---- SHADE_Managed/src/Math/Vector3.cxx | 3 --- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/SHADE_Managed/premake5.lua b/SHADE_Managed/premake5.lua index 835bea1a..b68fadb6 100644 --- a/SHADE_Managed/premake5.lua +++ b/SHADE_Managed/premake5.lua @@ -39,6 +39,12 @@ project "SHADE_Managed" "yaml-cpp", "imgui", "spdlog", + "SHADE_Engine" + } + + defines + { + "NOMINMAX" } flags diff --git a/SHADE_Managed/src/Math/Vector2.cxx b/SHADE_Managed/src/Math/Vector2.cxx index d12ec72a..d40e2323 100644 --- a/SHADE_Managed/src/Math/Vector2.cxx +++ b/SHADE_Managed/src/Math/Vector2.cxx @@ -20,9 +20,6 @@ of DigiPen Institute of Technology is prohibited. #include // Project Headers #include "Math.hxx" -// Undefinitions -#undef min -#undef max namespace SHADE { diff --git a/SHADE_Managed/src/Math/Vector2.hxx b/SHADE_Managed/src/Math/Vector2.hxx index fc01595d..26d4ae6a 100644 --- a/SHADE_Managed/src/Math/Vector2.hxx +++ b/SHADE_Managed/src/Math/Vector2.hxx @@ -16,10 +16,6 @@ of DigiPen Institute of Technology is prohibited. // Standard Libraries #include -// Undefine -#undef min -#undef max - namespace SHADE { /// diff --git a/SHADE_Managed/src/Math/Vector3.cxx b/SHADE_Managed/src/Math/Vector3.cxx index e8dc2c2f..26ff5a72 100644 --- a/SHADE_Managed/src/Math/Vector3.cxx +++ b/SHADE_Managed/src/Math/Vector3.cxx @@ -20,9 +20,6 @@ of DigiPen Institute of Technology is prohibited. #include // Project Headers #include "Math.hxx" -// Undefinitions -#undef min -#undef max namespace SHADE {