From 4978a8f167435e3ac751682cd0a634ed4c13411d Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Sun, 28 Jan 2018 04:30:46 +0000 Subject: [PATCH] Fix some preprocessor logic errors regrading GL ES on ARM devices with desktop operating systems. git-svn-id: https://svn.eduke32.com/eduke32@6603 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/build/include/glbuild.h | 3 +++ source/build/src/sdlayer.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/source/build/include/glbuild.h b/source/build/include/glbuild.h index e68f4aeda..cab3ed376 100644 --- a/source/build/include/glbuild.h +++ b/source/build/include/glbuild.h @@ -24,6 +24,9 @@ # include #elif defined EDUKE32_IOS # include +#elif defined EDUKE32_GLES +# include +# include #else # include # include diff --git a/source/build/src/sdlayer.cpp b/source/build/src/sdlayer.cpp index 523425868..57f65bd84 100644 --- a/source/build/src/sdlayer.cpp +++ b/source/build/src/sdlayer.cpp @@ -1593,7 +1593,7 @@ int32_t setvideomode(int32_t x, int32_t y, int32_t c, int32_t fs) int32_t value; } sdlayer_gl_attributes[] = { -#ifdef EDUKE32_TOUCH_DEVICES +#ifdef EDUKE32_GLES { SDL_GL_CONTEXT_MAJOR_VERSION, 1 }, { SDL_GL_CONTEXT_MINOR_VERSION, 1 }, #endif