configure.in
changeset 11367 e8fc755a89e8
parent 11365 a9bd2625fa01
child 11381 2610f8f0a9c6
     1.1 --- a/configure.in	Sun Aug 27 19:32:08 2017 -0700
     1.2 +++ b/configure.in	Sun Aug 27 23:25:12 2017 -0400
     1.3 @@ -2409,7 +2409,6 @@
     1.4  dnl Find Vulkan Header
     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 @@ -2434,24 +2433,8 @@
    1.12              # I put this in the AC_TRY_COMPILE.
    1.13              AC_MSG_WARN([Sorry, Vulkan does not work on this configuration.])
    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 -            AC_CHECK_HEADER($vulkan_header,
    1.21 -                            have_vulkan_hdr=yes,
    1.22 -                            have_vulkan_hdr=no)
    1.23 -            CPPFLAGS="$save_CPPFLAGS"
    1.24 -        fi
    1.25      fi
    1.26 -    if test x$have_vulkan_hdr = xyes; then
    1.27 -        # vulkan.h has been found in either $VULKAN_SDK/include or along the
    1.28 -        # the standard include path. Unfortunately there seems no easy
    1.29 -        # way to find out which, so...
    1.30 -        if test -n "$VULKAN_SDK" -a -f "$vsdk_include_dir/$vulkan_header"; then 
    1.31 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -I$vsdk_include_dir"
    1.32 -        fi
    1.33 +    if test x$enable_video_vulkan = xyes; then
    1.34          AC_DEFINE(SDL_VIDEO_VULKAN_SURFACE, 1, [ ])
    1.35          SUMMARY_video="${SUMMARY_video} vulkan"
    1.36      fi
    1.37 @@ -3680,7 +3663,7 @@
    1.38          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGLES"
    1.39          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
    1.40          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,UIKit"
    1.41 -        if test x$ac_cv_header_vulkan_vulkan_h = xyes; then
    1.42 +        if test x$enable_video_vulkan = xyes; then
    1.43              EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
    1.44          fi
    1.45          ;;
    1.46 @@ -3758,7 +3741,7 @@
    1.47          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
    1.48          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
    1.49          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
    1.50 -        if test x$ac_cv_header_vulkan_vulkan_h = xyes; then
    1.51 +        if test x$enable_video_vulkan = xyes; then
    1.52              EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
    1.53          fi
    1.54          ;;