From 34ff76c0e7f26d4188b93d933b2b613b6db90f24 Mon Sep 17 00:00:00 2001 From: Matt Gajownik Date: Sat, 19 Mar 2022 13:07:17 +1100 Subject: [PATCH] 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. --- .gitmodules | 3 --- plugins/CMakeLists.txt | 11 ----------- plugins/obs-vst | 1 - 3 files changed, 15 deletions(-) delete mode 160000 plugins/obs-vst diff --git a/.gitmodules b/.gitmodules index fa1c4f10f..18bee8413 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 72c506b9e..c38bfd4b4 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -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) diff --git a/plugins/obs-vst b/plugins/obs-vst deleted file mode 160000 index b2fd17f65..000000000 --- a/plugins/obs-vst +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b2fd17f6564da1cb03495fd957147d8002ee2a79