From b262ab0fe7506a75f1055f3b89203aa8592e78a0 Mon Sep 17 00:00:00 2001 From: milek7 Date: Tue, 27 Mar 2018 20:59:12 +0200 Subject: [PATCH] android preparations, day 1 --- Texture.h | 1 - openglmatrixstack.h | 1 - stdafx.h | 10 +++++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Texture.h b/Texture.h index bbdffdd3..61c01d0c 100644 --- a/Texture.h +++ b/Texture.h @@ -12,7 +12,6 @@ http://mozilla.org/MPL/2.0/. #include #include "winheaders.h" #include -#include "GL/glew.h" #include "ResourceManager.h" struct opengl_texture { diff --git a/openglmatrixstack.h b/openglmatrixstack.h index 46471868..fd453877 100644 --- a/openglmatrixstack.h +++ b/openglmatrixstack.h @@ -15,7 +15,6 @@ http://mozilla.org/MPL/2.0/. #include #include #include -#include "GL/glew.h" #ifdef _WIN32 #include "GL/wglew.h" #endif diff --git a/stdafx.h b/stdafx.h index 59afd59c..20ac3fa2 100644 --- a/stdafx.h +++ b/stdafx.h @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -75,13 +74,22 @@ #define GLFW_DLL #endif // _windows #endif // build_static +#ifndef __ANDROID__ #include "GL/glew.h" +#else +#include +#include +#endif #ifdef _WIN32 #include "GL/wglew.h" #endif #define GLFW_INCLUDE_GLU +#ifndef __ANDROID__ #include +#endif + +#define GLM_ENABLE_EXPERIMENTAL #include #include #include