mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-03 01:53:35 +00:00
deps,shared,obs-ffmpeg: Move media-playback to shared folder
This commit is contained in:
parent
326d5f4e31
commit
4b1e16203f
1
deps/CMakeLists.txt
vendored
1
deps/CMakeLists.txt
vendored
|
@ -5,6 +5,5 @@ endif()
|
|||
add_subdirectory(blake2)
|
||||
add_subdirectory(glad)
|
||||
add_subdirectory(libcaption)
|
||||
add_subdirectory(media-playback)
|
||||
add_subdirectory(obs-scripting)
|
||||
add_subdirectory(opts-parser)
|
||||
|
|
|
@ -17,7 +17,7 @@ find_package(
|
|||
# cmake-format: on
|
||||
|
||||
if(NOT TARGET OBS::media-playback)
|
||||
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/media-playback" "${CMAKE_BINARY_DIR}/deps/media-playback")
|
||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/media-playback" "${CMAKE_BINARY_DIR}/shared/media-playback")
|
||||
endif()
|
||||
|
||||
if(NOT TARGET OBS::opts-parser)
|
||||
|
|
|
@ -17,6 +17,10 @@ find_package(
|
|||
add_library(obs-ffmpeg MODULE)
|
||||
add_library(OBS::ffmpeg ALIAS obs-ffmpeg)
|
||||
|
||||
if(NOT TARGET OBS::media-playback)
|
||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/media-playback" "${CMAKE_BINARY_DIR}/shared/media-playback")
|
||||
endif()
|
||||
|
||||
add_subdirectory(ffmpeg-mux)
|
||||
if(ENABLE_NEW_MPEGTS_OUTPUT)
|
||||
find_package(Librist QUIET)
|
||||
|
|
Loading…
Reference in a new issue