OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-03 01:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

deps,shared,plugins: Move file-updater to shared folder

Browse source
This commit is contained in:
tytan652 2023-08-02 10:47:45 +02:00
parent b0aac7e794
commit bef7de616e
8 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
deps/CMakeLists.txt vendored
View file

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

2
plugins/rtmp-services/CMakeLists.txt
View file

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

4
plugins/rtmp-services/cmake/legacy.cmake
View file

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

2
plugins/win-capture/CMakeLists.txt
View file

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

4
plugins/win-capture/cmake/legacy.cmake
View file

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

0
deps/file-updater/CMakeLists.txt → shared/file-updater/CMakeLists.txt
View file

0
deps/file-updater/file-updater/file-updater.c → shared/file-updater/file-updater/file-updater.c
View file

0
deps/file-updater/file-updater/file-updater.h → shared/file-updater/file-updater/file-updater.h
View file