mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-05 11:03:31 +00:00
deps,shared,obs-outputs: Move happy-eyeballs to shared folder
This commit is contained in:
parent
f650cdf6bb
commit
51c17032be
1
deps/CMakeLists.txt
vendored
1
deps/CMakeLists.txt
vendored
|
@ -5,7 +5,6 @@ endif()
|
|||
|
||||
add_subdirectory(blake2)
|
||||
add_subdirectory(glad)
|
||||
add_subdirectory(happy-eyeballs)
|
||||
add_subdirectory(libcaption)
|
||||
add_subdirectory(media-playback)
|
||||
add_subdirectory(obs-scripting)
|
||||
|
|
|
@ -6,7 +6,7 @@ find_package(MbedTLS REQUIRED)
|
|||
find_package(ZLIB REQUIRED)
|
||||
|
||||
if(NOT TARGET happy-eyeballs)
|
||||
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/happy-eyeballs" "${CMAKE_BINARY_DIR}/deps/happy-eyeballs")
|
||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/happy-eyeballs" "${CMAKE_BINARY_DIR}/shared/happy-eyeballs")
|
||||
endif()
|
||||
|
||||
add_library(obs-outputs MODULE)
|
||||
|
|
|
@ -13,6 +13,10 @@ mark_as_advanced(ENABLE_STATIC_MBEDTLS)
|
|||
add_library(obs-outputs MODULE)
|
||||
add_library(OBS::outputs ALIAS obs-outputs)
|
||||
|
||||
if(NOT TARGET happy-eyeballs)
|
||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/happy-eyeballs" "${CMAKE_BINARY_DIR}/shared/happy-eyeballs")
|
||||
endif()
|
||||
|
||||
target_sources(
|
||||
obs-outputs
|
||||
PRIVATE obs-outputs.c
|
||||
|
|
Loading…
Reference in a new issue