diff --git a/Makefile b/Makefile index 40b9356e4e..31cc2e2c02 100644 --- a/Makefile +++ b/Makefile @@ -231,8 +231,8 @@ ifeq ($(HAVE_OPENGL), 1) endif ifeq ($(HAVE_GLES), 1) - LIBS += -lGLESv2 - DEFINES += -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_OPENGLES3 + LIBS += $(GLES_LIBS) + DEFINES += $(GLES_CFLAGS) -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_OPENGLES3 OBJ += gfx/glsym/glsym_es2.o else DEFINES += -DHAVE_GL_SYNC diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 031fd76c16..06fa85d44a 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -205,8 +205,14 @@ check_pkgconf LIBXML2 libxml-2.0 if [ "$HAVE_EGL" = "yes" ]; then if [ "$HAVE_GLES" != "no" ]; then - HAVE_GLES=auto check_pkgconf GLES glesv2 - [ "$HAVE_GLES" = "no" ] && HAVE_GLES=auto check_lib GLES "-lGLESv2 $EXTRA_GL_LIBS" + if [ "$GLES_LIBS" ] || [ "$GLES_CFLAGS" ]; then + echo "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" + fi fi if [ "$HAVE_VG" != "no" ]; then check_pkgconf VG vg diff --git a/qb/config.params.sh b/qb/config.params.sh index a50a5ca657..3219a54758 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -4,6 +4,8 @@ HAVE_SDL=auto # SDL support HAVE_UDEV=auto # Udev/Evdev gamepad support HAVE_LIBRETRO= # libretro library used 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_THREADS=auto # Threading support HAVE_FFMPEG=auto # Enable FFmpeg recording support HAVE_DYLIB=auto # Enable dynamic loading support diff --git a/qb/qb.params.sh b/qb/qb.params.sh index 9f8f180072..089043dcef 100644 --- a/qb/qb.params.sh +++ b/qb/qb.params.sh @@ -1,4 +1,3 @@ -## lvl. 43 regex dragon awaits thee. print_help() { cat << EOF ====================