From ea435f936173f0346e0c58e633d013ddae316cb6 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 20 Mar 2022 06:02:46 -0600 Subject: [PATCH] chore: update macOS dependencies, remove workaround (#16826) --- CMakeLists.txt | 4 ++-- src/openrct2-ui/CMakeLists.txt | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb08bc606e..964e8b11bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,9 +128,9 @@ if (MACOS_USE_DEPENDENCIES) # if we're building on macOS, then we need the dependencies include(cmake/download.cmake) - set(MACOS_DYLIBS_VERSION "29") + set(MACOS_DYLIBS_VERSION "31") set(MACOS_DYLIBS_ZIPFILE "openrct2-libs-v${MACOS_DYLIBS_VERSION}-universal-macos-dylibs.zip") - set(MACOS_DYLIBS_SHA1 "86cf2db4d87173112a00042418d0d18cae360e41") + set(MACOS_DYLIBS_SHA1 "b1162cf91cd98949f88edd8aa22102fc82f1c6f4") set(MACOS_DYLIBS_DIR "${ROOT_DIR}/lib/macos") set(MACOS_DYLIBS_URL "https://github.com/OpenRCT2/Dependencies/releases/download/v${MACOS_DYLIBS_VERSION}/${MACOS_DYLIBS_ZIPFILE}") diff --git a/src/openrct2-ui/CMakeLists.txt b/src/openrct2-ui/CMakeLists.txt index e1545cbd4b..8364cf3aa9 100644 --- a/src/openrct2-ui/CMakeLists.txt +++ b/src/openrct2-ui/CMakeLists.txt @@ -35,17 +35,6 @@ file(GLOB_RECURSE OPENRCT2_UI_HEADERS if (APPLE) file(GLOB_RECURSE OPENRCT2_UI_MM_SOURCES "${CMAKE_CURRENT_LIST_DIR}/*.mm") set_source_files_properties(${OPENRCT2_UI_MM_SOURCES} PROPERTIES COMPILE_FLAGS "-x objective-c++ -fmodules") - if ("${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64") - # cross-compilation workaround for SDL2 - # This has been addressed upstream in https://github.com/libsdl-org/SDL/commit/bf1d7a3a15a6c090188974bec8ca84eb1903d4f7 - # Remove this workaround after: - # 1) a new SDL release is made containing that fix - # 2) The vcpkg port is updated to use that release - # 3) A new Dependencies release is made with that latest vcpkg version - # 4) That new release is used in this build - set(SDL_DISABLE_IMMINTRIN_H "-DSDL_DISABLE_IMMINTRIN_H") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SDL_DISABLE_IMMINTRIN_H}") - endif () endif () # Outputs