From de61fd575631325170eb2ffd4776ffa9823b164b Mon Sep 17 00:00:00 2001 From: Matt Gajownik Date: Sat, 17 May 2025 11:22:00 +1000 Subject: [PATCH] CI: Add CEF & enable obs-browser for Windows on ARM --- CMakePresets.json | 2 +- buildspec.json | 3 ++- plugins/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 09d8e9e10..5456ac12a 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -134,7 +134,7 @@ "GPU_PRIORITY_VAL": {"type": "STRING", "value": "$penv{GPU_PRIORITY_VAL}"}, "VIRTUALCAM_GUID": {"type": "STRING", "value": "A3FCE0F5-3493-419F-958A-ABA1250EC20B"}, "ENABLE_AJA": false, - "ENABLE_BROWSER": false, + "ENABLE_BROWSER": true, "ENABLE_SCRIPTING": false, "ENABLE_VST": false } diff --git a/buildspec.json b/buildspec.json index d1412af33..e4542b43d 100644 --- a/buildspec.json +++ b/buildspec.json @@ -34,7 +34,8 @@ "macos-arm64": "1bb59dbb759150e170796f641a4a84c59c0dea4ffef89477e9d811520af5d15a", "ubuntu-x86_64": "cb7225c7a937ac4cdc9c41700061f45cccc640d696902357782e57f8250bf43a", "ubuntu-aarch64": "f92df7f076bdc8cac2e3c77e27be418008b7168723201cb73fdbc2f6d91bc778", - "windows-x64": "922efbda1f2f8be9e5b2754d878a14d90afc81f04e94fc9101a7513e2b5cecc1" + "windows-x64": "922efbda1f2f8be9e5b2754d878a14d90afc81f04e94fc9101a7513e2b5cecc1", + "windows-arm64": "df9df4bd85826b4c071c6db404fd59cf93efd9c58ec3ab64e204466ae19bb02a" }, "revision": { "macos-x86_64": 3, diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 470e727c1..c12f015c8 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -10,7 +10,7 @@ endif() set_property(GLOBAL APPEND PROPERTY OBS_FEATURES_ENABLED "Plugin Support") macro(check_obs_browser) - if((OS_WINDOWS AND CMAKE_VS_PLATFORM_NAME MATCHES "(Win32|x64)") OR OS_MACOS OR OS_LINUX) + if((OS_WINDOWS AND CMAKE_VS_PLATFORM_NAME MATCHES "(ARM64|x64)") OR OS_MACOS OR OS_LINUX) if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/obs-browser/CMakeLists.txt") message(FATAL_ERROR "Required submodule 'obs-browser' not available.") else()