Merge pull request from orbea/configure

Align ./configure --help options.
This commit is contained in:
Twinaphex 2016-08-28 02:59:59 +02:00 committed by GitHub
commit b3dc1afcbe
5 changed files with 6 additions and 6 deletions

@ -860,7 +860,7 @@ ifeq ($(HAVE_VULKAN), 1)
$(GLSLANG_OBJ) \
$(SPIRV_CROSS_OBJ)
ifeq ($(HAVE_VULKAN_KHR_DISPLAY), 1)
ifeq ($(HAVE_VULKAN_DISPLAY), 1)
OBJ += gfx/drivers_context/khr_display_ctx.o
endif
ifeq ($(HAVE_MENU_COMMON), 1)

@ -84,7 +84,7 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
#ifdef EMSCRIPTEN
&gfx_ctx_emscripten,
#endif
#if defined(HAVE_VULKAN) && defined(HAVE_VULKAN_KHR_DISPLAY)
#if defined(HAVE_VULKAN) && defined(HAVE_VULKAN_DISPLAY)
&gfx_ctx_khr_display,
#endif
&gfx_ctx_null,

@ -168,7 +168,7 @@ VIDEO CONTEXT
#ifdef HAVE_VULKAN
#include "../gfx/common/vulkan_common.c"
#include "../libretro-common/vulkan/vulkan_symbol_wrapper.c"
#ifdef HAVE_VULKAN_KHR_DISPLAY
#ifdef HAVE_VULKAN_DISPLAY
#include "../gfx/drivers_context/khr_display_ctx.c"
#endif
#endif

@ -82,7 +82,7 @@ HAVE_CHEEVOS=yes # Retro Achievements
HAVE_SHADERPIPELINE=yes # Additional shader-based pipelines
C89_SHADERPIPELINE=no
HAVE_VULKAN=auto # Vulkan support
HAVE_VULKAN_KHR_DISPLAY=yes # Vulkan KHR display backend support
HAVE_VULKAN_DISPLAY=yes # Vulkan KHR display backend support
C89_VULKAN=no
HAVE_RPNG=yes # RPNG support
HAVE_RBMP=yes # RBMP support

@ -2,7 +2,7 @@ print_help_option() # $1 = option $@ = description
{
_opt="$1"
shift 1
printf " %-24s %s\n" "$_opt" "$@"
printf " %-25s %s\n" "$_opt" "$@"
}
print_help()
@ -43,7 +43,7 @@ EOF
print_help_option "--enable-$VAR" "Enable $COMMENT"
print_help_option "--disable-$VAR" "Disable $COMMENT";;
*)
print_help_option "--with-$VAR" "$COMMENT";;
print_help_option "--with-$VAR" "Config $COMMENT";;
esac
esac
done < 'qb/config.params.sh'