We removed QuartzCore link dependency in commit d459d8934897
authorSam Lantinga <slouken@libsdl.org>
Mon, 28 Aug 2017 22:42:41 -0700
changeset 114093a5c77515d55
parent 11408 0783887749f6
child 11410 535e96a0ee39
We removed QuartzCore link dependency in commit d459d8934897
CMakeLists.txt
configure
configure.in
     1.1 --- a/CMakeLists.txt	Mon Aug 28 22:36:45 2017 -0700
     1.2 +++ b/CMakeLists.txt	Mon Aug 28 22:42:41 2017 -0700
     1.3 @@ -859,7 +859,7 @@
     1.4      endif()
     1.5  
     1.6      CHECK_C_SOURCE_COMPILES("
     1.7 -    #if defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH < 7
     1.8 +    #if defined(__ARM_ARCH) && __ARM_ARCH < 7
     1.9      #error Vulkan doesn't work on this configuration
    1.10      #endif
    1.11      int main()
    1.12 @@ -1434,10 +1434,6 @@
    1.13    endif()
    1.14  
    1.15    # Actually load the frameworks at the end so we don't duplicate include.
    1.16 -  if (VIDEO_VULKAN)
    1.17 -    find_library(QUARTZCORE QuartzCore)
    1.18 -    list(APPEND EXTRA_LIBS ${QUARTZCORE})
    1.19 -  endif()
    1.20    if(SDL_FRAMEWORK_COREVIDEO)
    1.21      find_library(COREVIDEO CoreVideo)
    1.22      list(APPEND EXTRA_LIBS ${COREVIDEO})
    1.23 @@ -1517,7 +1513,7 @@
    1.24    CheckPTHREAD()
    1.25  endif()
    1.26  
    1.27 -if(VIDEO_VULKAN AND (NOT APPLE OR QUARTZCORE))
    1.28 +if(VIDEO_VULKAN)
    1.29    set(SDL_VIDEO_VULKAN 1)
    1.30  endif()
    1.31  
     2.1 --- a/configure	Mon Aug 28 22:36:45 2017 -0700
     2.2 +++ b/configure	Mon Aug 28 22:42:41 2017 -0700
     2.3 @@ -24269,9 +24269,6 @@
     2.4          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGLES"
     2.5          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
     2.6          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,UIKit"
     2.7 -        if test x$enable_video_vulkan = xyes; then
     2.8 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
     2.9 -        fi
    2.10          ;;
    2.11      *-*-darwin* )
    2.12          # This could be either full "Mac OS X", or plain "Darwin" which is
    2.13 @@ -24359,9 +24356,6 @@
    2.14          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
    2.15          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
    2.16          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
    2.17 -        if test x$enable_video_vulkan = xyes; then
    2.18 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
    2.19 -        fi
    2.20          ;;
    2.21      *-nacl|*-pnacl)
    2.22          ARCH=nacl
     3.1 --- a/configure.in	Mon Aug 28 22:36:45 2017 -0700
     3.2 +++ b/configure.in	Mon Aug 28 22:42:41 2017 -0700
     3.3 @@ -3678,9 +3678,6 @@
     3.4          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGLES"
     3.5          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
     3.6          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,UIKit"
     3.7 -        if test x$enable_video_vulkan = xyes; then
     3.8 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
     3.9 -        fi
    3.10          ;;
    3.11      *-*-darwin* )
    3.12          # This could be either full "Mac OS X", or plain "Darwin" which is
    3.13 @@ -3756,9 +3753,6 @@
    3.14          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
    3.15          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
    3.16          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
    3.17 -        if test x$enable_video_vulkan = xyes; then
    3.18 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
    3.19 -        fi
    3.20          ;;
    3.21      *-nacl|*-pnacl)
    3.22          ARCH=nacl