From 7a59eef47ebbee1344ae35bdc6086cb1b6574971 Mon Sep 17 00:00:00 2001 From: Richard Jenkins Date: Tue, 23 May 2017 15:37:03 +0100 Subject: [PATCH] Fix cmake for OpenRCT2-UI on macOS --- CMakeLists.txt | 1 + src/openrct2-ui/CMakeLists.txt | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 709ed10acc..6852a0e482 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,7 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR) message(FATAL_ERROR "Building in-source is not supported! Create a build dir and remove ${CMAKE_SOURCE_DIR}/CMakeCache.txt") endif() set(ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}") +set(CMAKE_MACOSX_RPATH 1) set(TITLE_SEQUENCE_URL "https://github.com/OpenRCT2/title-sequences/releases/download/v0.0.5/title-sequence-v0.0.5.zip") set(TITLE_SEQUENCE_SHA1 "79ffb2585d12abcbfce205d7696e3472a504b005") diff --git a/src/openrct2-ui/CMakeLists.txt b/src/openrct2-ui/CMakeLists.txt index 535fa9f087..7ff4d16ba3 100644 --- a/src/openrct2-ui/CMakeLists.txt +++ b/src/openrct2-ui/CMakeLists.txt @@ -12,6 +12,7 @@ include(FindPkgConfig) # Third party libraries PKG_CHECK_MODULES(SDL2 REQUIRED sdl2) +PKG_CHECK_MODULES(SPEEX REQUIRED speexdsp) if (NOT DISABLE_OPENGL) # GL doesn't work nicely with macOS, while find_package doesn't work with multiarch on Ubuntu. if (APPLE) @@ -43,7 +44,12 @@ add_executable(${PROJECT} ${OPENRCT2_UI_SOURCES} ${OPENRCT2_UI_M_SOURCES} ${OPEN target_link_libraries(${PROJECT} "libopenrct2" ${SDL2_LIBRARIES} - ${SDL2_TTF_LIBRARIES}) + ${SDL2_TTF_LIBRARIES} + ${SPEEX_LIBRARIES}) + +if (APPLE) + target_link_libraries(${PROJECT} "-framework Cocoa") +endif () if (NOT DISABLE_OPENGL) if (WIN32) @@ -57,7 +63,8 @@ endif () # Includes target_include_directories(${PROJECT} PRIVATE "${CMAKE_CURRENT_LIST_DIR}/.." - ${SDL2_INCLUDE_DIRS}) + ${SDL2_INCLUDE_DIRS} + ${SPEEX_INCLUDE_DIRS}) # Compiler flags if (FORCE32)