[Bf-blender-cvs] [0539208f971] master: Fix T97666: Blender not starting on macOS 10.14 after library upgrade
Brecht Van Lommel
noreply at git.blender.org
Thu Apr 28 00:32:08 CEST 2022
Commit: 0539208f971fbb271010d6d6a40cb77bef51456b
Author: Brecht Van Lommel
Date: Thu Apr 28 00:14:20 2022 +0200
Branches: master
https://developer.blender.org/rB0539208f971fbb271010d6d6a40cb77bef51456b
Fix T97666: Blender not starting on macOS 10.14 after library upgrade
===================================================================
M build_files/cmake/platform/platform_apple.cmake
===================================================================
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)
More information about the Bf-blender-cvs
mailing list