mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove speex dependency from libopenrct2

This commit is contained in:
Ted John 2017-06-25 11:46:59 +01:00
parent 95514b9cbc
commit c4ad6571ea
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2/CMakeLists.txt
View File

@ -55,8 +55,6 @@ if (NOT DISABLE_NETWORK)
find_package(OpenSSL 1.0.0 REQUIRED) find_package(OpenSSL 1.0.0 REQUIRED)
endif () endif ()
# Third party libraries (which we want to eventually remove from libopenrct2)
PKG_CHECK_MODULES(SPEEX REQUIRED speexdsp)
if (NOT DISABLE_TTF) if (NOT DISABLE_TTF)
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
PKG_CHECK_MODULES(FONTCONFIG REQUIRED fontconfig) PKG_CHECK_MODULES(FONTCONFIG REQUIRED fontconfig)
@ -150,13 +148,11 @@ endif ()
# Libraries # Libraries
if (STATIC) if (STATIC)
target_link_libraries(${PROJECT} ${JANSSON_STATIC_LIBRARIES} target_link_libraries(${PROJECT} ${JANSSON_STATIC_LIBRARIES}
${SPEEX_STATIC_LIBRARIES}
${PNG_STATIC_LIBRARIES} ${PNG_STATIC_LIBRARIES}
${ZLIB_STATIC_LIBRARIES} ${ZLIB_STATIC_LIBRARIES}
${LIBZIP_STATIC_LIBRARIES}) ${LIBZIP_STATIC_LIBRARIES})
else () else ()
target_link_libraries(${PROJECT} ${JANSSON_LIBRARIES} target_link_libraries(${PROJECT} ${JANSSON_LIBRARIES}
${SPEEX_LIBRARIES}
${PNG_LIBRARIES} ${PNG_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${LIBZIP_LIBRARIES}) ${LIBZIP_LIBRARIES})
@ -201,9 +197,7 @@ endif()
# Includes # Includes
target_include_directories(${PROJECT} SYSTEM PRIVATE ${LIBZIP_INCLUDE_DIRS}) target_include_directories(${PROJECT} SYSTEM PRIVATE ${LIBZIP_INCLUDE_DIRS})
target_include_directories(${PROJECT} PRIVATE ${FREETYPE_INCLUDE_DIRS} target_include_directories(${PROJECT} PRIVATE ${JANSSON_INCLUDE_DIRS}
${JANSSON_INCLUDE_DIRS}
${SPEEX_INCLUDE_DIRS}
${PNG_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}) ${ZLIB_INCLUDE_DIRS})
if (NOT DISABLE_HTTP_TWITCH OR NOT DISABLE_NETWORK) if (NOT DISABLE_HTTP_TWITCH OR NOT DISABLE_NETWORK)
@ -212,8 +206,11 @@ endif ()
if (NOT DISABLE_NETWORK) if (NOT DISABLE_NETWORK)
target_include_directories(${PROJECT} PUBLIC ${OPENSSL_INCLUDE_DIR}) target_include_directories(${PROJECT} PUBLIC ${OPENSSL_INCLUDE_DIR})
endif () endif ()
if (NOT DISABLE_TTF AND UNIX AND NOT APPLE) if (NOT DISABLE_TTF)
target_include_directories(${PROJECT} PRIVATE ${FONTCONFIG_INCLUDE_DIRS}) target_include_directories(${PROJECT} PRIVATE ${FREETYPE_INCLUDE_DIRS})
if (UNIX AND NOT APPLE)
target_include_directories(${PROJECT} PRIVATE ${FONTCONFIG_INCLUDE_DIRS})
endif ()
endif () endif ()
if(APPLE) if(APPLE)