ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow OpenGL to be disabled.

This commit is contained in:
Themaister 2011-11-01 18:24:43 +01:00
parent 65665f36cc
commit 1981b14de9
5 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -86,13 +86,17 @@ ifeq ($(HAVE_COREAUDIO), 1)
endif endif
ifeq ($(HAVE_SDL), 1) ifeq ($(HAVE_SDL), 1)
OBJ += gfx/sdl.o gfx/gl.o gfx/sdlwrap.o input/sdl.o audio/sdl.o fifo_buffer.o OBJ += gfx/sdl.o gfx/sdlwrap.o input/sdl.o audio/sdl.o fifo_buffer.o
DEFINES += $(SDL_CFLAGS) $(BSD_LOCAL_INC) DEFINES += $(SDL_CFLAGS) $(BSD_LOCAL_INC)
LIBS += $(SDL_LIBS) LIBS += $(SDL_LIBS)
ifeq ($(HAVE_OPENGL), 1)
OBJ += gfx/gl.o
ifeq ($(OSX),1) ifeq ($(OSX),1)
LIBS += -framework OpenGL LIBS += -framework OpenGL
else else
LIBS += -lGL LIBS += -lGL
endif
endif endif
endif endif
@ -108,9 +112,13 @@ ifeq ($(HAVE_CG), 1)
endif endif
ifeq ($(HAVE_XML), 1) ifeq ($(HAVE_XML), 1)
OBJ += gfx/shader_glsl.o sha256.o cheats.o OBJ += sha256.o cheats.o
LIBS += $(XML_LIBS) LIBS += $(XML_LIBS)
DEFINES += $(XML_CFLAGS) DEFINES += $(XML_CFLAGS)
ifeq ($(HAVE_OPENGL), 1)
OBJ += gfx/shader_glsl.o
endif
endif endif
ifeq ($(HAVE_XML), 1) ifeq ($(HAVE_XML), 1)

2
config.def.h
View File

@ -55,7 +55,7 @@
#define INPUT_X 12 #define INPUT_X 12
//////////////////////// ////////////////////////
#if defined(HAVE_SDL) #if defined(HAVE_OPENGL)
#define VIDEO_DEFAULT_DRIVER VIDEO_GL #define VIDEO_DEFAULT_DRIVER VIDEO_GL
#elif defined(HAVE_XVIDEO) #elif defined(HAVE_XVIDEO)
#define VIDEO_DEFAULT_DRIVER VIDEO_XVIDEO #define VIDEO_DEFAULT_DRIVER VIDEO_XVIDEO

4
driver.c
View File

@ -68,8 +68,10 @@ static const audio_driver_t *audio_drivers[] = {
}; };
static const video_driver_t *video_drivers[] = { static const video_driver_t *video_drivers[] = {
#ifdef HAVE_SDL #ifdef HAVE_OPENGL
&video_gl, &video_gl,
#endif
#ifdef HAVE_SDL
&video_sdl, &video_sdl,
#endif #endif
#ifdef HAVE_XVIDEO #ifdef HAVE_XVIDEO

9
qb/config.libs.sh
View File

@ -61,7 +61,12 @@ check_pkgconf SDL sdl 1.2.10
check_critical SDL "Cannot find SDL library." check_critical SDL "Cannot find SDL library."
# On some distros, -lCg doesn't link against -lstdc++ it seems ... # On some distros, -lCg doesn't link against -lstdc++ it seems ...
check_lib_cxx CG -lCg cgCreateContext if [ $HAVE_OPENGL != no ]; then
check_lib_cxx CG -lCg cgCreateContext
else
echo "Ignoring Cg, as OpenGL is not compiled in ..."
HAVE_CG=no
fi
check_pkgconf XML libxml-2.0 check_pkgconf XML libxml-2.0
check_pkgconf SDL_IMAGE SDL_image check_pkgconf SDL_IMAGE SDL_image
@ -102,7 +107,7 @@ check_pkgconf PYTHON python3
add_define_make OS $OS add_define_make OS $OS
# Creates config.mk and config.h. # Creates config.mk and config.h.
VARS="ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL DYLIB CG XML SDL_IMAGE DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE CONFIGFILE FREETYPE XVIDEO X11 XEXT NETPLAY FBO STRL PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM X264RGB" VARS="ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL DYLIB CG XML SDL_IMAGE DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE CONFIGFILE FREETYPE XVIDEO X11 XEXT NETPLAY FBO STRL PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM X264RGB"
create_config_make config.mk $VARS create_config_make config.mk $VARS
create_config_header config.h $VARS create_config_header config.h $VARS

1
qb/config.params.sh
View File

@ -14,6 +14,7 @@ add_command_line_enable X264RGB "Enable lossless X264 RGB recording" no
add_command_line_enable DYLIB "Enable dynamic loading support" auto add_command_line_enable DYLIB "Enable dynamic loading support" auto
add_command_line_enable NETPLAY "Enable netplay support" auto add_command_line_enable NETPLAY "Enable netplay support" auto
add_command_line_enable CONFIGFILE "Disable support for config file" yes add_command_line_enable CONFIGFILE "Disable support for config file" yes
add_command_line_enable OPENGL "Disable OpenGL support" yes
add_command_line_enable CG "Enable Cg shader support" auto add_command_line_enable CG "Enable Cg shader support" auto
add_command_line_enable XML "Enable bSNES-style XML shader support" auto add_command_line_enable XML "Enable bSNES-style XML shader support" auto
add_command_line_enable FBO "Enable render-to-texture (FBO) support" auto add_command_line_enable FBO "Enable render-to-texture (FBO) support" auto