mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-31 18:55:23 +01:00
Code Issues Releases Wiki Activity

chore: update macOS dependencies, remove workaround (#16826)

Browse Source
This commit is contained in:
Adam
2022-03-20 06:02:46 -06:00
committed by GitHub
parent 37a0a0cb18
commit ea435f9361
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -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}")

11
src/openrct2-ui/CMakeLists.txt
View File

@@ -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