From dfbce1ad4cdbd0aea4f98262694b91436f7ccf33 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Mon, 28 Aug 2017 22:01:48 +0200 Subject: [PATCH] Fix Cmake compilation on macOS 10.12.6 --- src/openrct2-ui/CMakeLists.txt | 4 ++-- src/openrct2/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openrct2-ui/CMakeLists.txt b/src/openrct2-ui/CMakeLists.txt index 0caa26e695..40fd93efe6 100644 --- a/src/openrct2-ui/CMakeLists.txt +++ b/src/openrct2-ui/CMakeLists.txt @@ -44,8 +44,8 @@ project(${PROJECT}) add_executable(${PROJECT} ${OPENRCT2_UI_SOURCES} ${OPENRCT2_UI_M_SOURCES} ${OPENRCT2_UI_MM_SOURCES}) target_link_libraries(${PROJECT} "libopenrct2" - ${SDL2_LIBRARIES} - ${SPEEX_LIBRARIES}) + ${SDL2_LDFLAGS} + ${SPEEX_LDFLAGS}) if (APPLE) target_link_libraries(${PROJECT} "-framework Cocoa") diff --git a/src/openrct2/CMakeLists.txt b/src/openrct2/CMakeLists.txt index 6a0af049f2..7b17bc2594 100644 --- a/src/openrct2/CMakeLists.txt +++ b/src/openrct2/CMakeLists.txt @@ -200,8 +200,8 @@ endif() # Includes target_include_directories(${PROJECT} SYSTEM PRIVATE ${LIBZIP_INCLUDE_DIRS}) -target_include_directories(${PROJECT} PRIVATE ${JANSSON_INCLUDE_DIRS} - ${PNG_INCLUDE_DIRS} +target_include_directories(${PROJECT} PUBLIC ${JANSSON_INCLUDE_DIRS}) +target_include_directories(${PROJECT} PRIVATE ${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) if (NOT DISABLE_HTTP_TWITCH OR NOT DISABLE_NETWORK) target_include_directories(${PROJECT} PRIVATE ${LIBCURL_INCLUDE_DIRS})