Przeglądaj źródła

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

tytan652 2 lat temu
rodzic
commit
fa0ffff7c0

+ 0 - 1
deps/CMakeLists.txt

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

+ 1 - 1
plugins/obs-outputs/CMakeLists.txt

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

+ 4 - 0
plugins/obs-outputs/cmake/legacy.cmake

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

+ 0 - 0
deps/happy-eyeballs/CMakeLists.txt → shared/happy-eyeballs/CMakeLists.txt


+ 0 - 0
deps/happy-eyeballs/happy-eyeballs.c → shared/happy-eyeballs/happy-eyeballs.c


+ 0 - 0
deps/happy-eyeballs/happy-eyeballs.h → shared/happy-eyeballs/happy-eyeballs.h