From 5f8232a594d0bb7d64fcaf368a7d9d5a2bcfa7ad Mon Sep 17 00:00:00 2001 From: Mike Solar Date: Sun, 2 Aug 2026 15:32:07 +0800 Subject: [PATCH] ci: fix macOS/Linux configure (oakgl) and Windows MSYS2 git - OAK_ENABLE_DYNAMIC_RENDER_BACKEND now defaults ON; it was previously undefined (OFF) unless passed, so CI configure failed on the unconditional oakgl target references in app/worker/tests - add git to the MSYS2 package list in ci.yml and cd.yml; the OTIO build step runs git clone in the msys2 shell, where git is not installed by default --- .github/workflows/cd.yml | 1 + .github/workflows/ci.yml | 1 + engine/CMakeLists.txt | 2 ++ 3 files changed, 4 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 7c57d569c..3c5ace395 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -26,6 +26,7 @@ jobs: msystem: UCRT64 update: true install: >- + git mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-ninja mingw-w64-ucrt-x86_64-gcc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a6f373fa..b6f05cd56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,6 +92,7 @@ jobs: update: true cache: true install: >- + git mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-ninja mingw-w64-ucrt-x86_64-gcc diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index 19703d95b..a3a3a2a99 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -147,6 +147,8 @@ endif () # Dynamic render backends (OpenGL/Vulkan) are engine plugins loaded via # dlopen; they share this engine library instead of embedding a static # render-core subset. +option(OAK_ENABLE_DYNAMIC_RENDER_BACKEND + "Build OpenGL/Vulkan render backends as dlopen plugins (oakgl/oakvulkan)" ON) if (OAK_ENABLE_DYNAMIC_RENDER_BACKEND) target_compile_definitions(oakengine-obj PRIVATE OAK_ENABLE_DYNAMIC_RENDER_BACKEND)