more dlls

stream-labs · Jan 22, 2025 · 8eac0c8 · 8eac0c8
1 parent 98de7f8
commit 8eac0c8
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 24 deletions.
diff --git a/libobs/cmake/os-windows.cmake b/libobs/cmake/os-windows.cmake
@@ -71,8 +71,10 @@ target_link_options(libobs PRIVATE /IGNORE:4098 /SAFESEH:NO)
 
 set_target_properties(libobs PROPERTIES PREFIX "" OUTPUT_NAME "obs")
 
+find_package(LibDataChannel 0.20 REQUIRED)
+
 if(NOT ENABLE_UI)
-set(DEPENDENCY_DLLS
+  set(DEPENDENCY_DLLS
     $<TARGET_FILE:FFmpeg::avcodec>
     $<TARGET_FILE:FFmpeg::avformat>
     $<TARGET_FILE:FFmpeg::avutil>
@@ -89,26 +91,27 @@ set(DEPENDENCY_DLLS
     "$<TARGET_FILE_DIR:Libsrt::Libsrt>/../bin/srt.dll"
 
     "$<TARGET_FILE_DIR:CURL::libcurl>/../bin/libcurl.dll"
-)
-set(DEPENDENCY_LIBS
-$<TARGET_FILE:Libsrt::Libsrt>
-$<TARGET_FILE:Librist::Librist>
-$<TARGET_FILE:ZLIB::ZLIB>
-$<TARGET_FILE:CURL::libcurl>
-)
-
-# foreach(DEP_BINARY ${DEPENDENCY_DLLS})
-#     message(STATUS "Adding custom command to copy ${DEP_BINARY} to ${OBS_EXECUTABLE_DESTINATION}")
-
-#     add_custom_command(TARGET libobs POST_BUILD
-#         COMMAND "${CMAKE_COMMAND}" -E echo "Copying dependencies binaries ${DEP_BINARY} to ${OBS_EXECUTABLE_DESTINATION}"
-#         COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${DEP_BINARY}" "${OBS_EXECUTABLE_DESTINATION}"
-#         COMMENT "."
-#         VERBATIM COMMAND_EXPAND_LISTS
-#     )
-# endforeach()
-
-install(FILES ${DEPENDENCY_DLLS} DESTINATION ${OBS_EXECUTABLE_DESTINATION})
-install(FILES ${DEPENDENCY_LIBS} DESTINATION ${OBS_LIBRARY_DESTINATION})
-
+    "$<TARGET_FILE_DIR:LibDataChannel::LibDataChannel>/../bin/datachannel.dll"
+  )
+
+  set(DEPENDENCY_LIBS
+    $<TARGET_FILE:Libsrt::Libsrt>
+    $<TARGET_FILE:Librist::Librist>
+    $<TARGET_FILE:ZLIB::ZLIB>
+    $<TARGET_FILE:CURL::libcurl>
+    $<TARGET_FILE:LibDataChannel::LibDataChannel>
+  )
+
+  # foreach(DEP_BINARY ${DEPENDENCY_DLLS})
+  # message(STATUS "Adding custom command to copy ${DEP_BINARY} to ${OBS_EXECUTABLE_DESTINATION}")
+
+  # add_custom_command(TARGET libobs POST_BUILD
+  # COMMAND "${CMAKE_COMMAND}" -E echo "Copying dependencies binaries ${DEP_BINARY} to ${OBS_EXECUTABLE_DESTINATION}"
+  # COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${DEP_BINARY}" "${OBS_EXECUTABLE_DESTINATION}"
+  # COMMENT "."
+  # VERBATIM COMMAND_EXPAND_LISTS
+  # )
+  # endforeach()
+  install(FILES ${DEPENDENCY_DLLS} DESTINATION ${OBS_EXECUTABLE_DESTINATION})
+  install(FILES ${DEPENDENCY_LIBS} DESTINATION ${OBS_LIBRARY_DESTINATION})
 endif()
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -64,7 +64,7 @@ if(OBS_CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0)
   add_obs_plugin(sl-vst PLATFORMS WINDOWS WITH_MESSAGE)
   add_obs_plugin(obs-webrtc)
 
-  check_obs_websocket()
+  #check_obs_websocket()
 
   add_obs_plugin(obs-x264)
   add_obs_plugin(oss-audio PLATFORMS FREEBSD OPENBSD)