From f650cdf6bba99eaf38b32dee56f1a79b5355b1ea Mon Sep 17 00:00:00 2001
From: tytan652 <tytan652@tytanium.xyz>
Date: Wed, 2 Aug 2023 10:47:45 +0200
Subject: [PATCH] deps,shared,plugins: Move file-updater to shared folder

---
 deps/CMakeLists.txt                                       | 1 -
 plugins/rtmp-services/CMakeLists.txt                      | 2 +-
 plugins/rtmp-services/cmake/legacy.cmake                  | 4 ++++
 plugins/win-capture/CMakeLists.txt                        | 2 +-
 plugins/win-capture/cmake/legacy.cmake                    | 4 ++++
 {deps => shared}/file-updater/CMakeLists.txt              | 0
 {deps => shared}/file-updater/file-updater/file-updater.c | 0
 {deps => shared}/file-updater/file-updater/file-updater.h | 0
 8 files changed, 10 insertions(+), 3 deletions(-)
 rename {deps => shared}/file-updater/CMakeLists.txt (100%)
 rename {deps => shared}/file-updater/file-updater/file-updater.c (100%)
 rename {deps => shared}/file-updater/file-updater/file-updater.h (100%)

diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index f046aba69..7f065ec02 100644
--- a/deps/CMakeLists.txt
+++ b/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)
diff --git a/plugins/rtmp-services/CMakeLists.txt b/plugins/rtmp-services/CMakeLists.txt
index f2cf7555d..9a1c993a9 100644
--- a/plugins/rtmp-services/CMakeLists.txt
+++ b/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)
diff --git a/plugins/rtmp-services/cmake/legacy.cmake b/plugins/rtmp-services/cmake/legacy.cmake
index 1215746fc..88362cd75 100644
--- a/plugins/rtmp-services/cmake/legacy.cmake
+++ b/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
diff --git a/plugins/win-capture/CMakeLists.txt b/plugins/win-capture/CMakeLists.txt
index ae8bffaff..5b9bbeeab 100644
--- a/plugins/win-capture/CMakeLists.txt
+++ b/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)
diff --git a/plugins/win-capture/cmake/legacy.cmake b/plugins/win-capture/cmake/legacy.cmake
index 1b488a55b..26930754f 100644
--- a/plugins/win-capture/cmake/legacy.cmake
+++ b/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(
diff --git a/deps/file-updater/CMakeLists.txt b/shared/file-updater/CMakeLists.txt
similarity index 100%
rename from deps/file-updater/CMakeLists.txt
rename to shared/file-updater/CMakeLists.txt
diff --git a/deps/file-updater/file-updater/file-updater.c b/shared/file-updater/file-updater/file-updater.c
similarity index 100%
rename from deps/file-updater/file-updater/file-updater.c
rename to shared/file-updater/file-updater/file-updater.c
diff --git a/deps/file-updater/file-updater/file-updater.h b/shared/file-updater/file-updater/file-updater.h
similarity index 100%
rename from deps/file-updater/file-updater/file-updater.h
rename to shared/file-updater/file-updater/file-updater.h