From a21ab0a3c40570cf8a4bf50453f141b53dab538c Mon Sep 17 00:00:00 2001 From: Travis CI Date: Mon, 19 Aug 2019 13:43:01 +0000 Subject: Gem 1ab32e47ec2362fc6257c574abb31c539d5204ac osx/i386 built 'master:1ab32e47ec2362fc6257c574abb31c539d5204ac' for osx/i386 --- Gem/develop/include/Gem/Base/GemMath.h | 4 ++-- Gem/develop/include/Gem/Base/TextBase.h | 6 +++--- Gem/develop/include/Gem/Gem/RTE.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Gem/develop') 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 +# elif defined HAVE_FTFONT_H +# include # 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 #ifdef _MSC_VER # pragma warning( pop ) -- cgit v1.2.1