diff options
| author | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2019-01-09 19:45:58 +0000 |
|---|---|---|
| committer | Travis CI <zmoelnig@travis-ci.umlaeute.mur.at> | 2019-01-09 19:45:58 +0000 |
| commit | d74b77331a83d34262eddce736da163db91cf4e0 (patch) | |
| tree | 7c1a418779cd6d82105d239c166eb099202eae49 /Gem/develop/include/Gem/Base | |
| parent | 63845621e2a4a3013dd410db3212b9500dd23768 (diff) | |
Gem d136736e8da1d549bd8f44bb50c26fc98f76f776 osx/x86_64
built 'master:d136736e8da1d549bd8f44bb50c26fc98f76f776' for osx/x86_64
Diffstat (limited to 'Gem/develop/include/Gem/Base')
| -rw-r--r-- | Gem/develop/include/Gem/Base/GemBase.h | 1 | ||||
| -rw-r--r-- | Gem/develop/include/Gem/Base/GemPixObj.h | 6 | ||||
| -rw-r--r-- | Gem/develop/include/Gem/Base/GemShape.h | 1 | ||||
| -rw-r--r-- | Gem/develop/include/Gem/Base/TextBase.h | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Gem/develop/include/Gem/Base/GemBase.h b/Gem/develop/include/Gem/Base/GemBase.h index 8ff4678..cc752d5 100644 --- a/Gem/develop/include/Gem/Base/GemBase.h +++ b/Gem/develop/include/Gem/Base/GemBase.h @@ -15,7 +15,6 @@ #ifndef _INCLUDE__GEM_BASE_GEMBASE_H_ #define _INCLUDE__GEM_BASE_GEMBASE_H_ -#include "Gem/GemGL.h" #include "Gem/ContextData.h" #include "Base/CPPExtern.h" diff --git a/Gem/develop/include/Gem/Base/GemPixObj.h b/Gem/develop/include/Gem/Base/GemPixObj.h index b6a4076..e9a4f9b 100644 --- a/Gem/develop/include/Gem/Base/GemPixObj.h +++ b/Gem/develop/include/Gem/Base/GemPixObj.h @@ -18,9 +18,9 @@ LOG #include "Base/GemBase.h" #include "Gem/Image.h" #include "Gem/Rectangle.h" -#include "stdlib.h" -#include "string.h" -#include "math.h" +#include <stdlib.h> +#include <string.h> +#include <math.h> /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/Gem/develop/include/Gem/Base/GemShape.h b/Gem/develop/include/Gem/Base/GemShape.h index 47395c2..d990a63 100644 --- a/Gem/develop/include/Gem/Base/GemShape.h +++ b/Gem/develop/include/Gem/Base/GemShape.h @@ -16,6 +16,7 @@ #define _INCLUDE__GEM_BASE_GEMSHAPE_H_ #include "Base/GemBase.h" +#include "Gem/GemGL.h" #include <map> /*----------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/Gem/develop/include/Gem/Base/TextBase.h b/Gem/develop/include/Gem/Base/TextBase.h index 7c6b832..4c10cb7 100644 --- a/Gem/develop/include/Gem/Base/TextBase.h +++ b/Gem/develop/include/Gem/Base/TextBase.h @@ -26,6 +26,7 @@ #include "RTE/Outlet.h" #include "Base/GemBase.h" +#include "Gem/GemGL.h" #include <vector> #include <string> |