diff --git a/libraries/gl/src/gl/Config.h b/libraries/gl/src/gl/Config.h index 0258f573f6..5c278400c9 100644 --- a/libraries/gl/src/gl/Config.h +++ b/libraries/gl/src/gl/Config.h @@ -16,7 +16,6 @@ #if defined(USE_GLES) #define HIFI_GLES -#define HIFI_EGL #endif #if defined(HIFI_GLES) @@ -37,10 +36,8 @@ #if defined(HIFI_GLES) #define GL_GLEXT_PROTOTYPES +#include #include -#include -#include -#include #define GL_DEPTH_COMPONENT32_OES 0x81A7 #define GL_TIME_ELAPSED_EXT 0x88BF diff --git a/libraries/gl/src/gl/OpenGLVersionChecker.cpp b/libraries/gl/src/gl/OpenGLVersionChecker.cpp index 771a8b9a75..05dfa7ea17 100644 --- a/libraries/gl/src/gl/OpenGLVersionChecker.cpp +++ b/libraries/gl/src/gl/OpenGLVersionChecker.cpp @@ -10,6 +10,9 @@ // #include "OpenGLVersionChecker.h" + +#if !defined(Q_OS_ANDROID) + #include "Config.h" #include @@ -110,3 +113,5 @@ QJsonObject OpenGLVersionChecker::checkVersion(bool& valid, bool& override) { return glData; } + +#endif diff --git a/libraries/gl/src/gl/OpenGLVersionChecker.h b/libraries/gl/src/gl/OpenGLVersionChecker.h index 913675af24..4b965122f5 100644 --- a/libraries/gl/src/gl/OpenGLVersionChecker.h +++ b/libraries/gl/src/gl/OpenGLVersionChecker.h @@ -12,6 +12,8 @@ #ifndef hifi_OpenGLVersionChecker_h #define hifi_OpenGLVersionChecker_h +#include +#if !defined(Q_OS_ANDROID) #include class OpenGLVersionChecker : public QApplication { @@ -21,5 +23,6 @@ public: static QJsonObject checkVersion(bool& valid, bool& override); }; +#endif #endif // hifi_OpenGLVersionChecker_h