New upstream version 21.0.2+dfsg1

This commit is contained in:
Sebastian Ramacher 2018-02-19 20:54:37 +01:00
parent 1f1bbb3518
commit baafb6325b
706 changed files with 49633 additions and 5044 deletions

View file

@ -1,3 +1,8 @@
option(DISABLE_PLUGINS "Disable building of OBS plugins" OFF)
if(DISABLE_PLUGINS)
message(STATUS "DISABLE_PLUGINS is set; building of plugins is disabled.")
return()
endif()
if(WIN32)
option(BUILD_CA_ENCODER "Build CoreAudio encoder module" ON)
@ -11,13 +16,10 @@ if(WIN32)
add_subdirectory(win-mf)
add_subdirectory(obs-qsv11)
add_subdirectory(vlc-video)
option(BUILD_AMF_ENCODER "Build AMD Advanced Media Framework encoder module" OFF)
if (BUILD_AMF_ENCODER)
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/enc-amf/CMakeLists.txt")
add_subdirectory(enc-amf)
else()
message(STATUS "enc-amf submodule not found! Please fetch submodules. enc-amf plugin disabled.")
endif()
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/enc-amf/CMakeLists.txt")
add_subdirectory(enc-amf)
else()
message(STATUS "enc-amf submodule not found! Please fetch submodules. enc-amf plugin disabled.")
endif()
if (MSVC)
add_subdirectory(win-ivcam)