mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-09 10:16:50 +00:00
Merge branch 'main' into dev/ffmpeg-player
This commit is contained in:
2
deps/CMakeLists.txt
vendored
2
deps/CMakeLists.txt
vendored
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user