From 72972196a4ebf8d41ba9e5c212fe89cd796f97eb Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sun, 11 Oct 2015 18:40:59 -1000 Subject: [PATCH] Windows fixes --- include/Global.hpp | 1 - include/Math.hpp | 6 ++++++ src/Math.cpp | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/Global.hpp b/include/Global.hpp index 2974223..e596be9 100644 --- a/include/Global.hpp +++ b/include/Global.hpp @@ -4,7 +4,6 @@ #if _M_IX86_FP >= 1 || _M_X64 # define __SSE__ 1 #endif -#include #if __SSE__ # include diff --git a/include/Math.hpp b/include/Math.hpp index e5ed781..2221e02 100644 --- a/include/Math.hpp +++ b/include/Math.hpp @@ -1,10 +1,16 @@ #ifndef MATH_HPP #define MATH_HPP +#ifndef NOMINMAX +#define NOMINMAX 1 +#endif +#ifndef _USE_MATH_DEFINES #define _USE_MATH_DEFINES 1 +#endif #include #include "CVector3f.hpp" #include "CTransform.hpp" +#include namespace Zeus { diff --git a/src/Math.cpp b/src/Math.cpp index be27638..1529d5f 100644 --- a/src/Math.cpp +++ b/src/Math.cpp @@ -1,5 +1,4 @@ #include "Math.hpp" -#include namespace Zeus {