aboutsummaryrefslogtreecommitdiff
path: root/Gem/develop
diff options
context:
space:
mode:
authorTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2019-08-19 13:54:09 +0000
committerTravis CI <zmoelnig@travis-ci.umlaeute.mur.at>2019-08-19 13:54:09 +0000
commitf693116721e09b9da3cd19bc6baf0783ac209862 (patch)
tree53f79340f2ec567d9f57b22c210fe0c7e87de58e /Gem/develop
parent9b873693bdcbfe439a4157564ece781f67e58239 (diff)
Gem 1ab32e47ec2362fc6257c574abb31c539d5204ac linux/amd64
built 'master:1ab32e47ec2362fc6257c574abb31c539d5204ac' for linux/amd64
Diffstat (limited to 'Gem/develop')
-rw-r--r--Gem/develop/include/Gem/Base/GemMath.h4
-rw-r--r--Gem/develop/include/Gem/Base/TextBase.h6
-rw-r--r--Gem/develop/include/Gem/Gem/RTE.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/Gem/develop/include/Gem/Base/GemMath.h b/Gem/develop/include/Gem/Base/GemMath.h
index 4a26d02..f9ce319 100644
--- a/Gem/develop/include/Gem/Base/GemMath.h
+++ b/Gem/develop/include/Gem/Base/GemMath.h
@@ -1,4 +1,4 @@
#ifdef __GNUC__
-# warning GemMath.h is deprecated - please include "Utils/Math.h" instead
+# warning GemMath.h is deprecated - please include "Utils/GemMath.h" instead
#endif
-#include "Utils/Math.h"
+#include "Utils/GemMath.h"
diff --git a/Gem/develop/include/Gem/Base/TextBase.h b/Gem/develop/include/Gem/Base/TextBase.h
index 4c10cb7..e3ba794 100644
--- a/Gem/develop/include/Gem/Base/TextBase.h
+++ b/Gem/develop/include/Gem/Base/TextBase.h
@@ -34,9 +34,9 @@
#ifdef FTGL
# define FONT_SCALE 0.2/3.0
# ifdef HAVE_FTGL_FTGL_H
-# include "FTGL/ftgl.h"
-# else
-# include "FTFont.h"
+# include <FTGL/ftgl.h>
+# elif defined HAVE_FTFONT_H
+# include <FTFont.h>
# endif
#else
# define FONT_SCALE 1.0
diff --git a/Gem/develop/include/Gem/Gem/RTE.h b/Gem/develop/include/Gem/Gem/RTE.h
index a9820b9..d463f69 100644
--- a/Gem/develop/include/Gem/Gem/RTE.h
+++ b/Gem/develop/include/Gem/Gem/RTE.h
@@ -19,7 +19,7 @@
# pragma warning( disable : 4091 )
#endif
-#include "m_pd.h"
+#include <m_pd.h>
#ifdef _MSC_VER
# pragma warning( pop )