configure
changeset 11367 e8fc755a89e8
parent 11365 a9bd2625fa01
child 11381 2610f8f0a9c6
     1.1 --- a/configure	Sun Aug 27 19:32:08 2017 -0700
     1.2 +++ b/configure	Sun Aug 27 23:25:12 2017 -0400
     1.3 @@ -21915,7 +21915,6 @@
     1.4  
     1.5  CheckVulkan()
     1.6  {
     1.7 -    have_vulkan_hdr=no
     1.8      if test x$enable_video = xyes -a x$enable_video_vulkan = xyes; then
     1.9          case "$host" in
    1.10              *-*-androideabi*)
    1.11 @@ -21955,30 +21954,8 @@
    1.12              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sorry, Vulkan does not work on this configuration." >&5
    1.13  $as_echo "$as_me: WARNING: Sorry, Vulkan does not work on this configuration." >&2;}
    1.14          fi
    1.15 -        if test x$enable_video_vulkan = xyes; then
    1.16 -            vsdk_include_dir="${VULKAN_SDK}/include"
    1.17 -            vulkan_header="vulkan/vulkan.h"
    1.18 -            save_CPPFLAGS="$CPPFLAGS"
    1.19 -            CPPFLAGS="${save_CPPFLAGS} -I$vsdk_include_dir"
    1.20 -            as_ac_Header=`$as_echo "ac_cv_header_$vulkan_header" | $as_tr_sh`
    1.21 -ac_fn_c_check_header_mongrel "$LINENO" "$vulkan_header" "$as_ac_Header" "$ac_includes_default"
    1.22 -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    1.23 -  have_vulkan_hdr=yes
    1.24 -else
    1.25 -  have_vulkan_hdr=no
    1.26 -fi
    1.27 -
    1.28 -
    1.29 -            CPPFLAGS="$save_CPPFLAGS"
    1.30 -        fi
    1.31 -    fi
    1.32 -    if test x$have_vulkan_hdr = xyes; then
    1.33 -        # vulkan.h has been found in either $VULKAN_SDK/include or along the
    1.34 -        # the standard include path. Unfortunately there seems no easy
    1.35 -        # way to find out which, so...
    1.36 -        if test -n "$VULKAN_SDK" -a -f "$vsdk_include_dir/$vulkan_header"; then
    1.37 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -I$vsdk_include_dir"
    1.38 -        fi
    1.39 +    fi
    1.40 +    if test x$enable_video_vulkan = xyes; then
    1.41  
    1.42  $as_echo "#define SDL_VIDEO_VULKAN_SURFACE 1" >>confdefs.h
    1.43  
    1.44 @@ -24272,7 +24249,7 @@
    1.45          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGLES"
    1.46          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
    1.47          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,UIKit"
    1.48 -        if test x$ac_cv_header_vulkan_vulkan_h = xyes; then
    1.49 +        if test x$enable_video_vulkan = xyes; then
    1.50              EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
    1.51          fi
    1.52          ;;
    1.53 @@ -24362,7 +24339,7 @@
    1.54          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
    1.55          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
    1.56          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
    1.57 -        if test x$ac_cv_header_vulkan_vulkan_h = xyes; then
    1.58 +        if test x$enable_video_vulkan = xyes; then
    1.59              EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
    1.60          fi
    1.61          ;;