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

Turn HAVE_GLES into HAVE_OPENGLES

Browse Source
This commit is contained in:
twinaphex 2016-09-17 00:38:35 +02:00
parent 7e87ba4dcb
commit e3c560014c
4 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.common
View File

@ -5,11 +5,11 @@ ifeq ($(HAVE_GL_CONTEXT),)
HAVE_GL_CONTEXT=1
endif
ifeq ($(HAVE_GLES), 1)
ifeq ($(HAVE_OPENGLES), 1)
HAVE_GL_CONTEXT=1
endif
ifeq ($(HAVE_GLES3), 1)
ifeq ($(HAVE_OPENGLES3), 1)
HAVE_GL_CONTEXT=1
endif
endif
@ -600,7 +600,7 @@ ifeq ($(HAVE_X11), 1)
ifeq ($(HAVE_XCB),1)
LIBS += -lX11-xcb
endif
ifneq ($(HAVE_GLES), 1)
ifneq ($(HAVE_OPENGLES), 1)
OBJ += gfx/drivers_context/x_ctx.o
endif
endif
@ -753,7 +753,7 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
endif
ifeq ($(HAVE_FFMPEG), 1)
ifneq ($(C89_BUILD), 1)
ifneq ($(HAVE_GLES), 1)
ifneq ($(HAVE_OPENGLES), 1)
OBJ += cores/libretro-ffmpeg/fft/fft.o
DEFINES += -Ideps -DHAVE_GL_FFT
NEED_CXX_LINKER=1
@ -761,10 +761,10 @@ endif
endif
endif
ifeq ($(HAVE_GLES), 1)
ifeq ($(HAVE_OPENGLES), 1)
LIBS += $(GLES_LIBS)
DEFINES += $(GLES_CFLAGS) -DHAVE_OPENGLES
ifeq ($(HAVE_GLES3), 1)
ifeq ($(HAVE_OPENGLES3), 1)
DEFINES += -DHAVE_OPENGLES3
else
DEFINES += -DHAVE_OPENGLES2

3
Makefile.emscripten
View File

@ -9,8 +9,7 @@ DEFINES := -DRARCH_INTERNAL -DHAVE_OVERLAY -DHAVE_MAIN
DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_EGL -DHAVE_OVERLAY -DHAVE_GLSL -DHAVE_FILTERS_BUILTIN
HAVE_EGL = 1
HAVE_OPENGL = 1
HAVE_GLES = 1
HAVE_OPENGLES = 1
HAVE_RJPEG = 1
HAVE_RPNG = 1
HAVE_EMSCRIPTEN = 1

16
qb/config.libs.sh
View File

@ -41,7 +41,7 @@ if [ "$HAVE_VIDEOCORE" = 'yes' ]; then
[ -d /opt/vc/include ] && add_include_dirs /opt/vc/include
[ -d /opt/vc/include/interface/vcos/pthreads ] && add_include_dirs /opt/vc/include/interface/vcos/pthreads
[ -d /opt/vc/include/interface/vmcs_host/linux ] && add_include_dirs /opt/vc/include/interface/vmcs_host/linux
HAVE_GLES='auto'
HAVE_OPENGLES='auto'
EXTRA_GL_LIBS="-lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm"
fi
@ -255,7 +255,7 @@ else
HAVE_D3D9=no
fi
if [ "$HAVE_OPENGL" != 'no' ] && [ "$HAVE_GLES" != 'yes' ]; then
if [ "$HAVE_OPENGL" != 'no' ] && [ "$HAVE_OPENGLES" != 'yes' ]; then
if [ "$OS" = 'Darwin' ]; then
check_header OPENGL "OpenGL/gl.h"
check_lib OPENGL "-framework OpenGL"
@ -338,14 +338,14 @@ fi
check_pkgconf LIBXML2 libxml-2.0
if [ "$HAVE_EGL" = "yes" ]; then
if [ "$HAVE_GLES" != "no" ]; then
if [ "$HAVE_OPENGLES" != "no" ]; then
if [ "$GLES_LIBS" ] || [ "$GLES_CFLAGS" ]; then
echo "Notice: Using custom OpenGLES CFLAGS ($GLES_CFLAGS) and LDFLAGS ($GLES_LIBS)."
add_define_make GLES_LIBS "$GLES_LIBS"
add_define_make GLES_CFLAGS "$GLES_CFLAGS"
else
HAVE_GLES=auto check_pkgconf GLES glesv2
[ "$HAVE_GLES" = "no" ] && HAVE_GLES=auto check_lib GLES "-lGLESv2 $EXTRA_GL_LIBS" && add_define_make GLES_LIBS "-lGLESv2 $EXTRA_GL_LIBS"
HAVE_OPENGLES=auto check_pkgconf GLES glesv2
[ "$HAVE_OPENGLES" = "no" ] && HAVE_OPENGLES=auto check_lib GLES "-lGLESv2 $EXTRA_GL_LIBS" && add_define_make GLES_LIBS "-lGLESv2 $EXTRA_GL_LIBS"
fi
fi
if [ "$HAVE_VG" != "no" ]; then
@ -357,7 +357,7 @@ if [ "$HAVE_EGL" = "yes" ]; then
fi
else
HAVE_VG=no
HAVE_GLES=no
HAVE_OPENGLES=no
fi
check_pkgconf V4L2 libv4l2
@ -367,7 +367,7 @@ if [ "$OS" = 'Darwin' ]; then
elif [ "$OS" = 'Win32' ]; then
HAVE_FBO=yes
else
if [ "$HAVE_GLES" = "yes" ]; then
if [ "$HAVE_OPENGLES" = "yes" ]; then
[ $HAVE_FBO != "no" ] && HAVE_FBO=yes
else
check_lib FBO -lGL glFramebufferTexture2D
@ -434,7 +434,7 @@ if [ "$HAVE_MATERIALUI" != 'no' ] || [ "$HAVE_XMB" != 'no' ] || [ "$HAVE_ZARCH"
HAVE_XMB=no
HAVE_ZARCH=no
echo "Notice: RGUI not available, MaterialUI, XMB and ZARCH will also be disabled."
elif [ "$HAVE_OPENGL" = 'no' ] && [ "$HAVE_GLES" = 'no' ] && [ "$HAVE_VULKAN" = 'no' ]; then
elif [ "$HAVE_OPENGL" = 'no' ] && [ "$HAVE_OPENGLES" = 'no' ] && [ "$HAVE_VULKAN" = 'no' ]; then
HAVE_MATERIALUI=no
HAVE_XMB=no
HAVE_ZARCH=no

8
qb/config.params.sh
View File

@ -17,8 +17,8 @@ HAVE_LIBRETRO= # Libretro library used
HAVE_ASSETS_DIR= # Assets install directory
HAVE_BIN_DIR= # Binary install directory
HAVE_MAN_DIR= # Manpage install directory
HAVE_GLES_LIBS= # Link flags for custom GLES library
HAVE_GLES_CFLAGS= # C-flags for custom GLES library
HAVE_OPENGLES_LIBS= # Link flags for custom GLES library
HAVE_OPENGLES_CFLAGS= # C-flags for custom GLES library
HAVE_THREADS=auto # Threading support
HAVE_FFMPEG=auto # FFmpeg recording support
C89_FFMPEG=no
@ -30,11 +30,11 @@ C89_NETWORKGAMEPAD=no
HAVE_NETPLAY=auto # Netplay support (requires networking)
HAVE_D3D9=yes # Direct3D 9 support
HAVE_OPENGL=auto # OpenGL support
HAVE_GLES=no # Use GLESv2 instead of desktop GL
HAVE_MALI_FBDEV=no # Mali fbdev context support
HAVE_VIVANTE_FBDEV=no # Vivante fbdev context support
HAVE_OPENDINGUX_FBDEV=no # Opendingux fbdev context support
HAVE_GLES3=no # OpenGLES3 support
HAVE_OPENGLES=no # Use GLESv2 instead of desktop GL
HAVE_OPENGLES3=no # OpenGLES3 support
HAVE_X11=auto # everything X11.
HAVE_OMAP=no # OMAP video support
HAVE_XINERAMA=auto # Xinerama support.