Selaa lähdekoodia

plugins: Add obs-websocket submodule

Adds obs-websocket as a submodule, to be included in future releases of
OBS Studio by default.
tt2468 3 vuotta sitten
vanhempi
sitoutus
a196fc7824
5 muutettua tiedostoa jossa 9 lisäystä ja 2 poistoa
  1. 3 0
      .gitmodules
  2. 2 1
      CI/check-cmake.sh
  3. 2 1
      CI/check-format.sh
  4. 1 0
      plugins/CMakeLists.txt
  5. 1 0
      plugins/obs-websocket

+ 3 - 0
.gitmodules

@@ -13,3 +13,6 @@
 [submodule "plugins/obs-outputs/ftl-sdk"]
 	path = plugins/obs-outputs/ftl-sdk
 	url = https://github.com/Mixer/ftl-sdk.git
+[submodule "plugins/obs-websocket"]
+	path = plugins/obs-websocket
+	url = https://github.com/obsproject/obs-websocket.git

+ 2 - 1
CI/check-cmake.sh

@@ -44,7 +44,8 @@ find . -type d \( \
     -path ./plugins/obs-outputs/ftl-sdk -o \
     -path ./plugins/obs-vst -o \
     -path ./plugins/obs-browser -o \
-    -path ./plugins/win-dshow/libdshowcapture \
+    -path ./plugins/win-dshow/libdshowcapture -o \
+    -path ./plugins/obs-websocket/deps \
 \) -prune -false -type f -o \
     -name 'CMakeLists.txt' -or \
     -name '*.cmake' \

+ 2 - 1
CI/check-format.sh

@@ -47,7 +47,8 @@ find . -type d \( \
     -path ./plugins/decklink/\*/decklink-sdk -o \
     -path ./plugins/enc-amf -o \
     -path ./plugins/mac-syphon/syphon-framework -o \
-    -path ./plugins/obs-outputs/ftl-sdk \
+    -path ./plugins/obs-outputs/ftl-sdk -o \
+    -path ./plugins/obs-websocket/deps \
 \) -prune -false -type f -o \
     -name '*.h' -or \
     -name '*.hpp' -or \

+ 1 - 0
plugins/CMakeLists.txt

@@ -92,3 +92,4 @@ add_subdirectory(obs-transitions)
 add_subdirectory(rtmp-services)
 add_subdirectory(text-freetype2)
 add_subdirectory(aja)
+add_subdirectory(obs-websocket)

+ 1 - 0
plugins/obs-websocket

@@ -0,0 +1 @@
+Subproject commit 8bf8995ad8274fd495b3d3db5fe2b8714339ae72