mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-05 02:53:32 +00:00
deps,shared,plugins: Move file-updater to shared folder
This commit is contained in:
parent
b0aac7e794
commit
bef7de616e
1
deps/CMakeLists.txt
vendored
1
deps/CMakeLists.txt
vendored
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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(
|
||||
|
|
Loading…
Reference in a new issue