1
0
Эх сурвалжийг харах

deps,shared,plugins: Move file-updater to shared folder

tytan652 2 жил өмнө
parent
commit
f293a6edd1

+ 0 - 1
deps/CMakeLists.txt

@@ -4,7 +4,6 @@ if(OS_WINDOWS)
 endif()
 
 add_subdirectory(blake2)
-add_subdirectory(file-updater)
 add_subdirectory(glad)
 add_subdirectory(happy-eyeballs)
 add_subdirectory(libcaption)

+ 1 - 1
plugins/rtmp-services/CMakeLists.txt

@@ -10,7 +10,7 @@ set(RTMP_SERVICES_URL
 mark_as_advanced(RTMP_SERVICES_URL)
 
 if(NOT TARGET OBS::file-updater)
-  add_subdirectory("${CMAKE_SOURCE_DIR}/deps/file-updater" "${CMAKE_BINARY_DIR}/deps/file-updater")
+  add_subdirectory("${CMAKE_SOURCE_DIR}/shared/file-updater" "${CMAKE_BINARY_DIR}/shared/file-updater")
 endif()
 
 find_package(jansson REQUIRED)

+ 4 - 0
plugins/rtmp-services/cmake/legacy.cmake

@@ -13,6 +13,10 @@ add_library(OBS::rtmp-services ALIAS rtmp-services)
 
 find_package(Jansson 2.5 REQUIRED)
 
+if(NOT TARGET OBS::file-updater)
+  add_subdirectory("${CMAKE_SOURCE_DIR}/shared/file-updater" "${CMAKE_BINARY_DIR}/shared/file-updater")
+endif()
+
 target_sources(
   rtmp-services
   PRIVATE service-specific/twitch.c

+ 1 - 1
plugins/win-capture/CMakeLists.txt

@@ -31,7 +31,7 @@ if(NOT TARGET OBS::ipc-util)
 endif()
 
 if(NOT TARGET OBS::file-updater)
-  add_subdirectory("${CMAKE_SOURCE_DIR}/deps/file-updater" "${CMAKE_BINARY_DIR}/deps/file-updater")
+  add_subdirectory("${CMAKE_SOURCE_DIR}/shared/file-updater" "${CMAKE_BINARY_DIR}/shared/file-updater")
 endif()
 
 find_package(jansson REQUIRED)

+ 4 - 0
plugins/win-capture/cmake/legacy.cmake

@@ -13,6 +13,10 @@ add_library(OBS::capture ALIAS win-capture)
 
 find_package(Jansson 2.5 REQUIRED)
 
+if(NOT TARGET OBS::file-updater)
+  add_subdirectory("${CMAKE_SOURCE_DIR}/shared/file-updater" "${CMAKE_BINARY_DIR}/shared/file-updater")
+endif()
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/compat-config.h.in ${CMAKE_BINARY_DIR}/config/compat-config.h)
 
 target_sources(

+ 0 - 0
deps/file-updater/CMakeLists.txt → shared/file-updater/CMakeLists.txt


+ 0 - 0
deps/file-updater/file-updater/file-updater.c → shared/file-updater/file-updater/file-updater.c


+ 0 - 0
deps/file-updater/file-updater/file-updater.h → shared/file-updater/file-updater/file-updater.h