Skip to content

Commit 9062c0d

Browse files
authored
Update libobs to v27.6.4 (#1160)
1 parent d11d9c0 commit 9062c0d

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ variables:
1414
SLGenerator: Visual Studio 16 2019
1515
SLDistributeDirectory: distribute
1616
SLFullDistributePath: $(SLBuildDirectory)\$(SLDistributeDirectory)
17-
LibOBSVersion: 27.6.2
17+
LibOBSVersion: 27.6.4
1818

1919
jobs:
2020
- job: 'WindowsRelease'
@@ -319,4 +319,4 @@ jobs:
319319
globExpressions: '$(tagartifact)-$(ReleaseName)-osx.tar.gz'
320320
filesAcl: 'public-read'
321321
displayName: 'Upload tag artifact to S3'
322-
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'tags'))
322+
condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'tags'))

obs-studio-server/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,11 @@ download_project(
166166
URL ${OSN_LIBOBS_URL}
167167
UPDATE_DISCONNECTED 1
168168
)
169+
if(WIN32)
170+
# LibObsTarget.cmake in widnows builds now contains a check for w32-pthreads
171+
# so we have to explicitly add it before libobs.
172+
include("${libobs_SOURCE_DIR}/cmake/w32-pthreads/w32-pthreadsConfig.cmake")
173+
endif()
169174

170175
include("${libobs_SOURCE_DIR}/cmake/LibObs/LibObsConfig.cmake")
171176

0 commit comments

Comments
 (0)