New upstream version 26.0.0+dfsg1
This commit is contained in:
parent
8e020cdacb
commit
240080891f
837 changed files with 41275 additions and 9196 deletions
|
|
@ -5,22 +5,21 @@ set_property(CACHE WITH_RTMPS PROPERTY STRINGS AUTO ON OFF)
|
|||
|
||||
option(STATIC_MBEDTLS "Statically link mbedTLS into binary" OFF)
|
||||
|
||||
if (WITH_RTMPS OR (WITH_RTMPS STREQUAL "AUTO"))
|
||||
find_package(MbedTLS QUIET)
|
||||
find_package(ZLIB QUIET)
|
||||
if (WITH_RTMPS STREQUAL "AUTO")
|
||||
find_package(MbedTLS)
|
||||
find_package(ZLIB)
|
||||
if (NOT MBEDTLS_FOUND OR NOT ZLIB_FOUND)
|
||||
set(WITH_RTMPS "OFF")
|
||||
message(WARNING "mbedTLS or zlib was not found, RTMPS will be auto-disabled")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if (LIBMBEDTLS_FOUND AND ZLIB_FOUND)
|
||||
if (WITH_RTMPS)
|
||||
find_package(MbedTLS REQUIRED)
|
||||
find_package(ZLIB REQUIRED)
|
||||
add_definitions(-DCRYPTO -DUSE_MBEDTLS)
|
||||
include_directories(${LIBMBEDTLS_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
|
||||
include_directories(${MBEDTLS_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
|
||||
else()
|
||||
if(WITH_RTMPS STREQUAL "AUTO")
|
||||
message(WARNING "mbedTLS was not found, RTMPS will be auto-disabled")
|
||||
elseif (WITH_RTMPS)
|
||||
message(FATAL_ERROR "RTMPS enabled by user, but mbedTLS was not found")
|
||||
endif()
|
||||
unset(LIBMBEDTLS_LIBRARIES)
|
||||
unset(ZLIB_LIBRARIES)
|
||||
add_definitions(-DNO_CRYPTO)
|
||||
endif()
|
||||
|
||||
|
|
@ -172,9 +171,10 @@ add_library(obs-outputs MODULE
|
|||
${obs-outputs_librtmp_HEADERS})
|
||||
target_link_libraries(obs-outputs
|
||||
libobs
|
||||
${LIBMBEDTLS_LIBRARIES}
|
||||
${MBEDTLS_LIBRARIES}
|
||||
${ZLIB_LIBRARIES}
|
||||
${ftl_IMPORTS}
|
||||
${obs-outputs_PLATFORM_DEPS})
|
||||
set_target_properties(obs-outputs PROPERTIES FOLDER "plugins")
|
||||
|
||||
install_obs_plugin_with_data(obs-outputs data)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue