We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch - apply to stated revision

SDL_metal_issue.patch (text/plain), 1.08 KB, created by Tom Seddon on 2020-11-25 23:00:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Seddon

Created: 2020-11-25 23:00:36 UTC

Size: 1.08 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index 0768836ea..3a8bf204c 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -20,6 +20,7 @@ include(CheckIncludeFiles)
> include(CheckIncludeFile)
> include(CheckSymbolExists)
> include(CheckCSourceCompiles)
>+include(CheckOBJCSourceCompiles)
> include(CheckCSourceRuns)
> include(CheckCCompilerFlag)
> include(CheckTypeSize)
>@@ -1758,9 +1759,7 @@ elseif(APPLE)
>     endif()
> 
>     if(VIDEO_VULKAN OR VIDEO_METAL OR RENDER_METAL)
>-      set(ORIG_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
>-      set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -ObjC")
>-      check_c_source_compiles("
>+      check_objc_source_compiles("
>         #include <AvailabilityMacros.h>
>         #import <Metal/Metal.h>
>         #import <QuartzCore/CAMetalLayer.h>
>@@ -1770,10 +1769,8 @@ elseif(APPLE)
>         #endif
>         int main()
>         {
>-            return 0;
>         }
>         " HAVE_FRAMEWORK_METAL)
>-      set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS})
>       if(HAVE_FRAMEWORK_METAL)
>         set(SDL_FRAMEWORK_METAL 1)
>         set(SDL_FRAMEWORK_QUARTZCORE 1)

Actions: View | Diff

Attachments on bug 5366: 4543 | 4558

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.