oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: fix macOS/Linux configure (oakgl) and Windows MSYS2 git

Browse Source 
- 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
This commit is contained in:
Mike-Solar
2026-08-02 15:32:07 +08:00
parent 22438e0596
commit 5f8232a594
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/cd.yml
+1
View File
@@ -26,6 +26,7 @@ jobs:
msystem: UCRT64 msystem: UCRT64
update: true update: true
install: >- install: >-
git
mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-cmake
mingw-w64-ucrt-x86_64-ninja mingw-w64-ucrt-x86_64-ninja
mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-gcc
.github/workflows/ci.yml
+1
View File
@@ -92,6 +92,7 @@ jobs:
update: true update: true
cache: true cache: true
install: >- install: >-
git
mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-cmake
mingw-w64-ucrt-x86_64-ninja mingw-w64-ucrt-x86_64-ninja
mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-gcc
engine/CMakeLists.txt
+2
View File
@@ -147,6 +147,8 @@ endif ()
# Dynamic render backends (OpenGL/Vulkan) are engine plugins loaded via # Dynamic render backends (OpenGL/Vulkan) are engine plugins loaded via
# dlopen; they share this engine library instead of embedding a static # dlopen; they share this engine library instead of embedding a static
# render-core subset. # 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) if (OAK_ENABLE_DYNAMIC_RENDER_BACKEND)
target_compile_definitions(oakengine-obj PRIVATE OAK_ENABLE_DYNAMIC_RENDER_BACKEND) target_compile_definitions(oakengine-obj PRIVATE OAK_ENABLE_DYNAMIC_RENDER_BACKEND)