Browse Source

deps,shared,win-capture: Move ipc-util to shared folder

tytan652 2 years ago
parent
commit
4b0b71ad5f

+ 0 - 1
deps/CMakeLists.txt

@@ -1,5 +1,4 @@
 if(OS_WINDOWS)
-  add_subdirectory(ipc-util)
   add_subdirectory(w32-pthreads)
 endif()
 

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

@@ -27,7 +27,7 @@ mark_as_advanced(COMPAT_URL)
 # cmake-format: on
 
 if(NOT TARGET OBS::ipc-util)
-  add_subdirectory("${CMAKE_SOURCE_DIR}/deps/ipc-util" "${CMAKE_BINARY_DIR}/deps/ipc-util")
+  add_subdirectory("${CMAKE_SOURCE_DIR}/shared/ipc-util" "${CMAKE_BINARY_DIR}/shared/ipc-util")
 endif()
 
 if(NOT TARGET OBS::file-updater)

+ 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::ipc-util)
+  add_subdirectory("${CMAKE_SOURCE_DIR}/shared/ipc-util" "${CMAKE_BINARY_DIR}/shared/ipc-util")
+endif()
+
 if(NOT TARGET OBS::file-updater)
   add_subdirectory("${CMAKE_SOURCE_DIR}/shared/file-updater" "${CMAKE_BINARY_DIR}/shared/file-updater")
 endif()

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

@@ -4,7 +4,7 @@ find_package(Detours REQUIRED)
 find_package(Vulkan REQUIRED)
 
 if(NOT TARGET OBS::ipc-util)
-  add_subdirectory("${CMAKE_SOURCE_DIR}/deps/ipc-util" "${CMAKE_BINARY_DIR}/deps/ipc-util")
+  add_subdirectory("${CMAKE_SOURCE_DIR}/shared/ipc-util" "${CMAKE_BINARY_DIR}/shared/ipc-util")
 endif()
 
 if(NOT TARGET OBS::obfuscate)

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

@@ -6,6 +6,10 @@ find_package(Vulkan REQUIRED)
 add_library(graphics-hook MODULE)
 add_library(OBS::graphics-hook ALIAS graphics-hook)
 
+if(NOT TARGET OBS::ipc-util)
+  add_subdirectory("${CMAKE_SOURCE_DIR}/shared/ipc-util" "${CMAKE_BINARY_DIR}/shared/ipc-util")
+endif()
+
 target_sources(
   graphics-hook
   PRIVATE graphics-hook.c

+ 0 - 0
deps/ipc-util/CMakeLists.txt → shared/ipc-util/CMakeLists.txt


+ 0 - 0
deps/ipc-util/ipc-util/pipe-posix.c → shared/ipc-util/ipc-util/pipe-posix.c


+ 0 - 0
deps/ipc-util/ipc-util/pipe-posix.h → shared/ipc-util/ipc-util/pipe-posix.h


+ 0 - 0
deps/ipc-util/ipc-util/pipe-windows.c → shared/ipc-util/ipc-util/pipe-windows.c


+ 0 - 0
deps/ipc-util/ipc-util/pipe-windows.h → shared/ipc-util/ipc-util/pipe-windows.h


+ 0 - 0
deps/ipc-util/ipc-util/pipe.h → shared/ipc-util/ipc-util/pipe.h