Update libobs to v27.6.4 (#1160)

stream-labs · Aug 18, 2022 · 9062c0d · 9062c0d
1 parent d11d9c0
commit 9062c0d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -14,7 +14,7 @@ variables:
   SLGenerator: Visual Studio 16 2019
   SLDistributeDirectory: distribute
   SLFullDistributePath: $(SLBuildDirectory)\$(SLDistributeDirectory)
-  LibOBSVersion: 27.6.2
+  LibOBSVersion: 27.6.4
 
 jobs:
 - job: 'WindowsRelease'
@@ -319,4 +319,4 @@ jobs:
       globExpressions: '$(tagartifact)-$(ReleaseName)-osx.tar.gz'
       filesAcl: 'public-read'
     displayName: 'Upload tag artifact to S3'
-    condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'tags'))
+    condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'tags'))
diff --git a/obs-studio-server/CMakeLists.txt b/obs-studio-server/CMakeLists.txt
@@ -166,6 +166,11 @@ download_project(
 	URL ${OSN_LIBOBS_URL}
 	UPDATE_DISCONNECTED 1
 )
+if(WIN32)
+	# LibObsTarget.cmake in widnows builds now contains a check for w32-pthreads 
+	# so we have to explicitly add it before libobs.
+	include("${libobs_SOURCE_DIR}/cmake/w32-pthreads/w32-pthreadsConfig.cmake")
+endif()
 
 include("${libobs_SOURCE_DIR}/cmake/LibObs/LibObsConfig.cmake")