mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-09-19 20:32:15 +02:00
obs-vst: Remove submodule in favour of direct merge 1/2
Please visit the submodule repo for blame history: https://github.com/obsproject/obs-vst NOTE: You may need to manually delete plugins/obs-vst to pull this diff.
This commit is contained in:
parent
93adc0a88c
commit
34ff76c0e7
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -10,9 +10,6 @@
|
||||
[submodule "plugins/obs-browser"]
|
||||
path = plugins/obs-browser
|
||||
url = https://github.com/obsproject/obs-browser.git
|
||||
[submodule "plugins/obs-vst"]
|
||||
path = plugins/obs-vst
|
||||
url = https://github.com/obsproject/obs-vst.git
|
||||
[submodule "plugins/obs-outputs/ftl-sdk"]
|
||||
path = plugins/obs-outputs/ftl-sdk
|
||||
url = https://github.com/Mixer/ftl-sdk.git
|
||||
|
@ -12,14 +12,6 @@ function(check_obs_browser)
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
function(check_obs_vst)
|
||||
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/obs-vst/CMakeLists.txt)
|
||||
add_subdirectory(obs-vst)
|
||||
else()
|
||||
obs_status(FATAL_ERROR "obs-vst submodule not available.")
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
# APPLE/WIN32/UNIX are soft-deprecated:
|
||||
# https://discourse.cmake.org/t/platform-id-vs-win32-vs-cmake-system-name/1226/2
|
||||
if(OS_WINDOWS)
|
||||
@ -43,7 +35,6 @@ if(OS_WINDOWS)
|
||||
endif()
|
||||
|
||||
check_obs_browser()
|
||||
check_obs_vst()
|
||||
elseif(OS_MACOS)
|
||||
add_subdirectory(coreaudio-encoder)
|
||||
add_subdirectory(mac-avcapture)
|
||||
@ -56,7 +47,6 @@ elseif(OS_MACOS)
|
||||
add_subdirectory(linux-jack)
|
||||
|
||||
check_obs_browser()
|
||||
check_obs_vst()
|
||||
elseif(OS_LINUX)
|
||||
add_subdirectory(linux-capture)
|
||||
add_subdirectory(linux-pulseaudio)
|
||||
@ -69,7 +59,6 @@ elseif(OS_LINUX)
|
||||
add_subdirectory(sndio)
|
||||
|
||||
check_obs_browser()
|
||||
check_obs_vst()
|
||||
elseif(OS_FREEBSD)
|
||||
add_subdirectory(linux-capture)
|
||||
add_subdirectory(linux-pulseaudio)
|
||||
|
@ -1 +0,0 @@
|
||||
Subproject commit b2fd17f6564da1cb03495fd957147d8002ee2a79
|
Loading…
Reference in New Issue
Block a user