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
This commit is contained in:
hendricks266 2018-01-28 04:30:46 +00:00
parent af6097a281
commit 4978a8f167
2 changed files with 4 additions and 1 deletions

View file

@ -24,6 +24,9 @@
# include <OpenGL/glu.h> # include <OpenGL/glu.h>
#elif defined EDUKE32_IOS #elif defined EDUKE32_IOS
# include <OpenGLES/ES1/gl.h> # include <OpenGLES/ES1/gl.h>
#elif defined EDUKE32_GLES
# include <SDL2/SDL_opengles.h>
# include <SDL2/SDL_opengl_glext.h>
#else #else
# include <GL/gl.h> # include <GL/gl.h>
# include <GL/glu.h> # include <GL/glu.h>

View file

@ -1593,7 +1593,7 @@ int32_t setvideomode(int32_t x, int32_t y, int32_t c, int32_t fs)
int32_t value; int32_t value;
} sdlayer_gl_attributes[] = } sdlayer_gl_attributes[] =
{ {
#ifdef EDUKE32_TOUCH_DEVICES #ifdef EDUKE32_GLES
{ SDL_GL_CONTEXT_MAJOR_VERSION, 1 }, { SDL_GL_CONTEXT_MAJOR_VERSION, 1 },
{ SDL_GL_CONTEXT_MINOR_VERSION, 1 }, { SDL_GL_CONTEXT_MINOR_VERSION, 1 },
#endif #endif