Skip to content

Commit

Permalink
Build with vendor-neutral OpenGL implementation by doing
Browse files Browse the repository at this point in the history
./configure --disable-glx
  • Loading branch information
LibretroAdmin committed Sep 11, 2024
1 parent 853c2cc commit 8abe49a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions qb/config.libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,10 @@ if [ "$HAVE_OPENGL" != 'no' ] && [ "$HAVE_OPENGLES" != 'yes' ]; then
elif [ "$OS" = 'Win32' ]; then
check_header '' OPENGL "GL/gl.h"
check_lib '' OPENGL -lopengl32
elif [ "$HAVE_GLX" = 'no' ]; then
# Use vendor-neutral OpenGL implementation instead of GLX
check_header '' OPENGL "GL/gl.h"
check_lib '' OPENGL -lOpenGL
else
check_header '' OPENGL "GL/gl.h"
check_lib '' OPENGL -lGL
Expand Down
1 change: 1 addition & 0 deletions qb/config.params.sh
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ HAVE_VIDEOCORE=auto # Broadcom Videocore 4 support
HAVE_DRMINGW=no # DrMingw exception handler
HAVE_CDROM=auto # CD-ROM support
HAVE_GLSL=yes # GLSL shaders support
HAVE_GLX=auto # GLX support (set this to 'off' for vendor-neutral OpenGL impl)
HAVE_SLANG=auto # slang support
C89_SLANG=no
HAVE_GLSLANG=auto # glslang support (requires C++11)
Expand Down
2 changes: 1 addition & 1 deletion runahead.c
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ static char *copy_core_to_temp_file(
int64_t dll_file_size = 0;
const char *core_base_name = path_basename_nocompression(core_path);

if (strlen(core_base_name) == 0)
if (string_is_empty(core_base_name))
return NULL;

if (!(tmpdir = get_tmpdir_alloc(dir_libretro)))
Expand Down

0 comments on commit 8abe49a

Please sign in to comment.