diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-04-28 01:14:20 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-04-28 01:24:10 +0300 |
| commit | 0539208f971fbb271010d6d6a40cb77bef51456b (patch) | |
| tree | 479ff6530deaede937d05002d1f2ec0d857f0d65 /build_files | |
| parent | e2cd5c6748ff393ef8dd1997c060c58751178532 (diff) | |
Fix T97666: Blender not starting on macOS 10.14 after library upgrade
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 91d0b54e426..32b10625590 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -215,7 +215,12 @@ if(WITH_SDL) find_package(SDL2) set(SDL_INCLUDE_DIR ${SDL2_INCLUDE_DIRS}) set(SDL_LIBRARY ${SDL2_LIBRARIES}) - string(APPEND PLATFORM_LINKFLAGS " -framework ForceFeedback -framework GameController -framework CoreHaptics") + string(APPEND PLATFORM_LINKFLAGS " -framework ForceFeedback -framework GameController") + if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64") + # The minimum macOS version of the libraries makes it so this is included in SDL on arm64 + # but not x86_64. + string(APPEND PLATFORM_LINKFLAGS " -framework CoreHaptics") + endif() endif() set(PNG_ROOT ${LIBDIR}/png) |