From b160fd20ff301ab3fb8e12796d5cf2f1971a23cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Wed, 17 Jun 2015 15:18:25 -0300 Subject: [PATCH] (Makefile) Fix non desktop GL builds --- Makefile.common | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/Makefile.common b/Makefile.common index 71e79ff8b1..d8c0874d1d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -469,9 +469,23 @@ ifeq ($(HAVE_PARPORT), 1) endif # Video -# -ifeq ($(HAVE_OPENGL), 1) +ifeq ($(HAVE_GL_CONTEXT),) + HAVE_GL_CONTEXT=0 + ifeq ($(HAVE_OPENGL), 1) + HAVE_GL_CONTEXT=1 + endif + + ifeq ($(HAVE_GLES), 1) + HAVE_GL_CONTEXT=1 + endif + + ifeq ($(HAVE_GLES3), 1) + HAVE_GL_CONTEXT=1 + endif +endif + +ifeq ($(HAVE_GL_CONTEXT), 1) DEFINES += -DHAVE_OPENGL -DHAVE_GLSL OBJ += gfx/drivers/gl.o \ gfx/video_context_driver.o \ @@ -563,7 +577,7 @@ ifeq ($(HAVE_SDL), 1) input/drivers_joypad/sdl_joypad.o \ audio/drivers/sdl_audio.o - ifeq ($(HAVE_OPENGL), 1) + ifeq ($(HAVE_GL_CONTEXT), 1) OBJ += gfx/drivers_context/sdl_gl_ctx.o endif @@ -578,7 +592,7 @@ ifeq ($(HAVE_SDL2), 1) input/drivers_joypad/sdl_joypad.o \ audio/drivers/sdl_audio.o - ifeq ($(HAVE_OPENGL), 1) + ifeq ($(HAVE_GL_CONTEXT), 1) OBJ += gfx/drivers_context/sdl_gl_ctx.o endif