mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't compile in GLX if HAVE_OPENGLES is defined

Browse Source
This commit is contained in:
twinaphex 2015-05-09 11:27:51 +02:00
parent 6fbd9df9d9
commit bbd2f6054b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.common
View File

@ -502,12 +502,14 @@ ifeq ($(HAVE_OPENGL), 1)
endif endif
ifeq ($(HAVE_X11), 1) ifeq ($(HAVE_X11), 1)
OBJ += gfx/drivers_context/glx_ctx.o
ifeq ($(HAVE_EGL), 1) ifeq ($(HAVE_EGL), 1)
OBJ += gfx/drivers_context/xegl_ctx.o OBJ += gfx/drivers_context/xegl_ctx.o
DEFINES += $(EGL_CFLAGS) DEFINES += $(EGL_CFLAGS)
LIBS += $(EGL_LIBS) LIBS += $(EGL_LIBS)
endif endif
ifneq ($(HAVE_EGL), 1)
OBJ += gfx/drivers_context/glx_ctx.o
endif
endif endif
ifeq ($(HAVE_WAYLAND), 1) ifeq ($(HAVE_WAYLAND), 1)

2
gfx/video_context_driver.c
View File

@ -41,7 +41,7 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
#if defined(_WIN32) && defined(HAVE_OPENGL) #if defined(_WIN32) && defined(HAVE_OPENGL)
&gfx_ctx_wgl, &gfx_ctx_wgl,
#endif #endif
#if defined(HAVE_X11) && defined(HAVE_OPENGL) #if defined(HAVE_X11) && defined(HAVE_OPENGL) && !defined(HAVE_OPENGLES)
&gfx_ctx_glx, &gfx_ctx_glx,
#endif #endif
#if defined(HAVE_WAYLAND) && defined(HAVE_OPENGL) && defined(HAVE_EGL) #if defined(HAVE_WAYLAND) && defined(HAVE_OPENGL) && defined(HAVE_EGL)