mirror of https://github.com/OpenRCT2/OpenRCT2.git
Remove speex dependency from libopenrct2
This commit is contained in:
parent
95514b9cbc
commit
c4ad6571ea
|
@ -55,8 +55,6 @@ if (NOT DISABLE_NETWORK)
|
|||
find_package(OpenSSL 1.0.0 REQUIRED)
|
||||
endif ()
|
||||
|
||||
# Third party libraries (which we want to eventually remove from libopenrct2)
|
||||
PKG_CHECK_MODULES(SPEEX REQUIRED speexdsp)
|
||||
if (NOT DISABLE_TTF)
|
||||
if (UNIX AND NOT APPLE)
|
||||
PKG_CHECK_MODULES(FONTCONFIG REQUIRED fontconfig)
|
||||
|
@ -150,13 +148,11 @@ endif ()
|
|||
# Libraries
|
||||
if (STATIC)
|
||||
target_link_libraries(${PROJECT} ${JANSSON_STATIC_LIBRARIES}
|
||||
${SPEEX_STATIC_LIBRARIES}
|
||||
${PNG_STATIC_LIBRARIES}
|
||||
${ZLIB_STATIC_LIBRARIES}
|
||||
${LIBZIP_STATIC_LIBRARIES})
|
||||
else ()
|
||||
target_link_libraries(${PROJECT} ${JANSSON_LIBRARIES}
|
||||
${SPEEX_LIBRARIES}
|
||||
${PNG_LIBRARIES}
|
||||
${ZLIB_LIBRARIES}
|
||||
${LIBZIP_LIBRARIES})
|
||||
|
@ -201,9 +197,7 @@ endif()
|
|||
|
||||
# Includes
|
||||
target_include_directories(${PROJECT} SYSTEM PRIVATE ${LIBZIP_INCLUDE_DIRS})
|
||||
target_include_directories(${PROJECT} PRIVATE ${FREETYPE_INCLUDE_DIRS}
|
||||
${JANSSON_INCLUDE_DIRS}
|
||||
${SPEEX_INCLUDE_DIRS}
|
||||
target_include_directories(${PROJECT} PRIVATE ${JANSSON_INCLUDE_DIRS}
|
||||
${PNG_INCLUDE_DIRS}
|
||||
${ZLIB_INCLUDE_DIRS})
|
||||
if (NOT DISABLE_HTTP_TWITCH OR NOT DISABLE_NETWORK)
|
||||
|
@ -212,8 +206,11 @@ endif ()
|
|||
if (NOT DISABLE_NETWORK)
|
||||
target_include_directories(${PROJECT} PUBLIC ${OPENSSL_INCLUDE_DIR})
|
||||
endif ()
|
||||
if (NOT DISABLE_TTF AND UNIX AND NOT APPLE)
|
||||
target_include_directories(${PROJECT} PRIVATE ${FONTCONFIG_INCLUDE_DIRS})
|
||||
if (NOT DISABLE_TTF)
|
||||
target_include_directories(${PROJECT} PRIVATE ${FREETYPE_INCLUDE_DIRS})
|
||||
if (UNIX AND NOT APPLE)
|
||||
target_include_directories(${PROJECT} PRIVATE ${FONTCONFIG_INCLUDE_DIRS})
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
if(APPLE)
|
||||
|
|
Loading…
Reference in New Issue