Merge branch 'main' into dev/ffmpeg-player

This commit is contained in:
Noisyfox
2026-08-26 21:47:20 +08:00
committed by GitHub
311 changed files with 51625 additions and 3151 deletions

2
deps/CMakeLists.txt vendored
View File

@@ -368,6 +368,7 @@ include(libnoise/libnoise.cmake)
include(Draco/Draco.cmake)
include(FFMPEG/FFMPEG.cmake)
include(Assimp/Assimp.cmake)
# I *think* 1.1 is used for *just* md5 hashing?
@@ -451,6 +452,7 @@ set(_dep_list
dep_python3
dep_wxInspector
dep_FFMPEG
dep_Assimp
)
if (MSVC)