adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine graphics detection and default seelection on config

Browse Source
This commit is contained in:
Michael Martin
2019-10-19 14:56:58 -07:00
parent 96174b06b5
commit 538e8e4eab
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/build/unix/build.config
+11 -7
View File
@@ -27,6 +27,8 @@ uqm_requirements()
# Libraries always used # Libraries always used
have_library SDL 1.2.8
have_library SDL2
have_library SDL 1.2.8 || have_library SDL2 || exit 1 have_library SDL 1.2.8 || have_library SDL2 || exit 1
use_library libpng || exit 1 use_library libpng || exit 1
@@ -206,6 +208,7 @@ uqm_prepare_config()
CHOICE_graphics_TITLE="Graphics Engine" CHOICE_graphics_TITLE="Graphics Engine"
CHOICE_graphics_OPTION_pure_TITLE="SDL1 without OpenGL graphics support" CHOICE_graphics_OPTION_pure_TITLE="SDL1 without OpenGL graphics support"
CHOICE_graphics_OPTION_pure_ACTION='graphics_pure_action' CHOICE_graphics_OPTION_pure_ACTION='graphics_pure_action'
CHOICE_graphics_OPTION_pure_PRECOND='have_library SDL 1.2.8'
graphics_pure_action() { graphics_pure_action() {
CFLAGS="$CFLAGS -DGFXMODULE_SDL -DSDL_DIR=SDL" CFLAGS="$CFLAGS -DGFXMODULE_SDL -DSDL_DIR=SDL"
GFXMODULE=sdl GFXMODULE=sdl
@@ -214,7 +217,7 @@ uqm_prepare_config()
} }
CHOICE_graphics_OPTION_opengl_TITLE="SDL1 with OpenGL graphics support" CHOICE_graphics_OPTION_opengl_TITLE="SDL1 with OpenGL graphics support"
CHOICE_graphics_OPTION_opengl_ACTION='graphics_opengl_action' CHOICE_graphics_OPTION_opengl_ACTION='graphics_opengl_action'
CHOICE_graphics_OPTION_opengl_PRECOND="have_library opengl" CHOICE_graphics_OPTION_opengl_PRECOND="have_library SDL 1.2.8 && have_library opengl"
graphics_opengl_action() { graphics_opengl_action() {
CFLAGS="$CFLAGS -DGFXMODULE_SDL -DHAVE_OPENGL -DSDL_DIR=SDL" CFLAGS="$CFLAGS -DGFXMODULE_SDL -DHAVE_OPENGL -DSDL_DIR=SDL"
GFXMODULE=sdl GFXMODULE=sdl
@@ -223,19 +226,20 @@ uqm_prepare_config()
} }
CHOICE_graphics_OPTION_sdl2_TITLE="SDL2 with modern graphics support" CHOICE_graphics_OPTION_sdl2_TITLE="SDL2 with modern graphics support"
CHOICE_graphics_OPTION_sdl2_ACTION='graphics_sdl2_action' CHOICE_graphics_OPTION_sdl2_ACTION='graphics_sdl2_action'
CHOICE_graphics_OPTION_sdl2_PRECOND='have_library SDL2'
graphics_sdl2_action() { graphics_sdl2_action() {
CFLAGS="$CFLAGS -DGFXMODULE_SDL -DSDL_DIR=SDL2" CFLAGS="$CFLAGS -DGFXMODULE_SDL -DSDL_DIR=SDL2"
GFXMODULE=sdl GFXMODULE=sdl
HAVE_OPENGL=0 HAVE_OPENGL=0
use_library SDL2 use_library SDL2
} }
# TODO: Once SDL2 has parity to SDL1, make it the default if if have_library SDL2; then
# available. CHOICE_graphics_DEFAULT=sdl2
# if have_library SDL2; then elif have_library opengl; then
# CHOICE_graphics_DEFAULT=sdl2
# else
CHOICE_graphics_DEFAULT=opengl CHOICE_graphics_DEFAULT=opengl
# fi else
CHOICE_graphics_DEFAULT=pure
fi
CHOICE_sound_OPTIONS="mixsdl openal" CHOICE_sound_OPTIONS="mixsdl openal"
CHOICE_sound_TITLE="Sound backend" CHOICE_sound_TITLE="Sound backend"