From c0530bcdf380cec2b821fbf00a5228eace3d9ba8 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 28 Aug 2017 22:42:41 -0700 Subject: [PATCH] We removed QuartzCore link dependency in commit 5be6badaf7e1 --- CMakeLists.txt | 8 ++------ configure | 6 ------ configure.in | 6 ------ 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dcd11967ad44..f5cbc9bdd90ab 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 dd15e3f5fbe5d..8b6adde1c0146 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 16498f3d5dbc6..963a2f4c1cf85 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