diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 635b6a847..d6f79c090 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -1,5 +1,4 @@ if(OS_WINDOWS) - add_subdirectory(ipc-util) add_subdirectory(w32-pthreads) endif() diff --git a/plugins/win-capture/CMakeLists.txt b/plugins/win-capture/CMakeLists.txt index 5b9bbeeab..c7026bf2c 100644 --- a/plugins/win-capture/CMakeLists.txt +++ b/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) diff --git a/plugins/win-capture/cmake/legacy.cmake b/plugins/win-capture/cmake/legacy.cmake index 26930754f..7c529a678 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::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() diff --git a/plugins/win-capture/graphics-hook/CMakeLists.txt b/plugins/win-capture/graphics-hook/CMakeLists.txt index 91378ba9c..e5ad38324 100644 --- a/plugins/win-capture/graphics-hook/CMakeLists.txt +++ b/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) diff --git a/plugins/win-capture/graphics-hook/cmake/legacy.cmake b/plugins/win-capture/graphics-hook/cmake/legacy.cmake index bcf2623b0..e23a364ef 100644 --- a/plugins/win-capture/graphics-hook/cmake/legacy.cmake +++ b/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 diff --git a/deps/ipc-util/CMakeLists.txt b/shared/ipc-util/CMakeLists.txt similarity index 100% rename from deps/ipc-util/CMakeLists.txt rename to shared/ipc-util/CMakeLists.txt diff --git a/deps/ipc-util/ipc-util/pipe-posix.c b/shared/ipc-util/ipc-util/pipe-posix.c similarity index 100% rename from deps/ipc-util/ipc-util/pipe-posix.c rename to shared/ipc-util/ipc-util/pipe-posix.c diff --git a/deps/ipc-util/ipc-util/pipe-posix.h b/shared/ipc-util/ipc-util/pipe-posix.h similarity index 100% rename from deps/ipc-util/ipc-util/pipe-posix.h rename to shared/ipc-util/ipc-util/pipe-posix.h diff --git a/deps/ipc-util/ipc-util/pipe-windows.c b/shared/ipc-util/ipc-util/pipe-windows.c similarity index 100% rename from deps/ipc-util/ipc-util/pipe-windows.c rename to shared/ipc-util/ipc-util/pipe-windows.c diff --git a/deps/ipc-util/ipc-util/pipe-windows.h b/shared/ipc-util/ipc-util/pipe-windows.h similarity index 100% rename from deps/ipc-util/ipc-util/pipe-windows.h rename to shared/ipc-util/ipc-util/pipe-windows.h diff --git a/deps/ipc-util/ipc-util/pipe.h b/shared/ipc-util/ipc-util/pipe.h similarity index 100% rename from deps/ipc-util/ipc-util/pipe.h rename to shared/ipc-util/ipc-util/pipe.h