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

This commit is contained in:
tytan652 2023-08-02 10:53:00 +02:00
parent ab05714919
commit 326d5f4e31
11 changed files with 10 additions and 3 deletions

1
deps/CMakeLists.txt vendored
View file

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

View file

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

View file

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

View file

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

View file

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