deps,shared,obs-outputs: Move happy-eyeballs to shared folder

This commit is contained in:
tytan652 2023-08-02 10:59:54 +02:00
parent bef7de616e
commit ab05714919
6 changed files with 5 additions and 2 deletions

1
deps/CMakeLists.txt vendored
View file

@ -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)

View file

@ -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)

View file

@ -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