We removed QuartzCore link dependency in commit 5be6badaf7e1
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8dcd119..f5cbc9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -859,7 +859,7 @@ if(ANDROID)
endif()
CHECK_C_SOURCE_COMPILES("
- #if defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH < 7
+ #if defined(__ARM_ARCH) && __ARM_ARCH < 7
#error Vulkan doesn't work on this configuration
#endif
int main()
@@ -1434,10 +1434,6 @@ elseif(APPLE)
endif()
# Actually load the frameworks at the end so we don't duplicate include.
- if (VIDEO_VULKAN)
- find_library(QUARTZCORE QuartzCore)
- list(APPEND EXTRA_LIBS ${QUARTZCORE})
- endif()
if(SDL_FRAMEWORK_COREVIDEO)
find_library(COREVIDEO CoreVideo)
list(APPEND EXTRA_LIBS ${COREVIDEO})
@@ -1517,7 +1513,7 @@ elseif(HAIKU)
CheckPTHREAD()
endif()
-if(VIDEO_VULKAN AND (NOT APPLE OR QUARTZCORE))
+if(VIDEO_VULKAN)
set(SDL_VIDEO_VULKAN 1)
endif()
diff --git a/configure b/configure
index dd15e3f..8b6adde 100755
--- a/configure
+++ b/configure
@@ -24269,9 +24269,6 @@ $as_echo "#define SDL_VIDEO_RENDER_OGL_ES2 1" >>confdefs.h
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGLES"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,UIKit"
- if test x$enable_video_vulkan = xyes; then
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
- fi
;;
*-*-darwin* )
# This could be either full "Mac OS X", or plain "Darwin" which is
@@ -24359,9 +24356,6 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
- if test x$enable_video_vulkan = xyes; then
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
- fi
;;
*-nacl|*-pnacl)
ARCH=nacl
diff --git a/configure.in b/configure.in
index 16498f3..963a2f4 100644
--- a/configure.in
+++ b/configure.in
@@ -3678,9 +3678,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGLES"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,UIKit"
- if test x$enable_video_vulkan = xyes; then
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
- fi
;;
*-*-darwin* )
# This could be either full "Mac OS X", or plain "Darwin" which is
@@ -3756,9 +3753,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
- if test x$enable_video_vulkan = xyes; then
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,QuartzCore"
- fi
;;
*-nacl|*-pnacl)
ARCH=nacl