diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd0e0f389..d26a466c6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ env: SLGenerator: Visual Studio 17 2022 SLDistributeDirectory: distribute SLFullDistributePath: "streamlabs-build.app/distribute" # The .app extension is required to run macOS tests correctly. - LibOBSVersion: 31.1.2sl20 + LibOBSVersion: 32.1.1test1 PACKAGE_NAME: osn jobs: diff --git a/README.md b/README.md index 7569ae22a..fe0df07e9 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,12 @@ cmake --build . --target install --config RelWithDebInfo This will will download any required dependencies, build the module, and then place it in an archive compatible with npm or yarn that you may specify in a given package.json. +If you are testing a local libobs development package that was built before it bundled its public development dependencies, pass those dependency package prefixes with `OSN_LIBOBS_DEPENDENCY_PREFIX_PATH`. For example: + +``` +cmake .. -G"Visual Studio 17 2022" -A x64 -DCMAKE_PREFIX_PATH=%CD%/libobs-src/cmake/ -DOSN_LIBOBS_DEPENDENCY_PREFIX_PATH=D:/path/to/obs/.deps/obs-deps-2025-08-23sl2-x64 +``` + ### Mac Building on Mac requires Xcode. @@ -168,4 +174,4 @@ If you wish to debug a specific test change the wildcard character to the name o } ] } -``` \ No newline at end of file +``` diff --git a/obs-studio-server/CMakeLists.txt b/obs-studio-server/CMakeLists.txt index d83aab614..09dc4b13d 100644 --- a/obs-studio-server/CMakeLists.txt +++ b/obs-studio-server/CMakeLists.txt @@ -209,12 +209,24 @@ set( CACHE STRING "Location of libobs archive to base on" ) +set( + OSN_LIBOBS_DEPENDENCY_PREFIX_PATH + "" + CACHE STRING "Additional CMake prefixes required by the libobs package" +) + download_project( PROJ libobs URL ${OSN_LIBOBS_URL} UPDATE_DISCONNECTED 1 ) +list(APPEND CMAKE_PREFIX_PATH "${libobs_SOURCE_DIR}" "${libobs_SOURCE_DIR}/cmake") +if(OSN_LIBOBS_DEPENDENCY_PREFIX_PATH) + list(APPEND CMAKE_PREFIX_PATH ${OSN_LIBOBS_DEPENDENCY_PREFIX_PATH}) +endif() +list(REMOVE_DUPLICATES CMAKE_PREFIX_PATH) + if (WIN32) include("${libobs_SOURCE_DIR}/cmake/LibObsConfig.cmake") elseif(APPLE)