juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-31 05:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: move FFmpeg media player sources to the common GUI list

Browse Source 
wxMediaCtrl3 and AVVideoDecoder are platform-neutral C++ compiled on
all three platforms, so list them once in the common SLIC3R_GUI_SOURCES
instead of duplicating them in the APPLE and non-APPLE branches. The
else() branch is now empty and drops out entirely.

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Noisyfox
2026-08-14 23:06:16 +08:00
parent adcbdddc12
commit 9c7e6711c6
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/slic3r/CMakeLists.txt
View File

@@ -38,6 +38,8 @@ set(SLIC3R_GUI_SOURCES
GUI/AuxiliaryDataViewModel.hpp GUI/AuxiliaryDataViewModel.hpp
GUI/AuxiliaryDialog.cpp GUI/AuxiliaryDialog.cpp
GUI/AuxiliaryDialog.hpp GUI/AuxiliaryDialog.hpp
GUI/AVVideoDecoder.cpp
GUI/AVVideoDecoder.hpp
GUI/Auxiliary.hpp GUI/Auxiliary.hpp
GUI/BackgroundSlicingProcess.cpp GUI/BackgroundSlicingProcess.cpp
GUI/BackgroundSlicingProcess.hpp GUI/BackgroundSlicingProcess.hpp
@@ -601,6 +603,8 @@ set(SLIC3R_GUI_SOURCES
GUI/WipeTowerDialog.cpp GUI/WipeTowerDialog.cpp
GUI/wxExtensions.cpp GUI/wxExtensions.cpp
GUI/wxExtensions.hpp GUI/wxExtensions.hpp
GUI/wxMediaCtrl3.cpp
GUI/wxMediaCtrl3.h
plugin/PythonInterpreter.cpp plugin/PythonInterpreter.cpp
plugin/PythonInterpreter.hpp plugin/PythonInterpreter.hpp
plugin/PythonPluginBridge.cpp plugin/PythonPluginBridge.cpp
@@ -784,19 +788,8 @@ if (APPLE)
GUI/DeepLinkHandlerMac.mm GUI/DeepLinkHandlerMac.mm
GUI/DeepLinkHandlerMac.h GUI/DeepLinkHandlerMac.h
GUI/GUI_UtilsMac.mm GUI/GUI_UtilsMac.mm
GUI/AVVideoDecoder.cpp
GUI/AVVideoDecoder.hpp
GUI/wxMediaCtrl3.cpp
GUI/wxMediaCtrl3.h
) )
FIND_LIBRARY(DISKARBITRATION_LIBRARY DiskArbitration) FIND_LIBRARY(DISKARBITRATION_LIBRARY DiskArbitration)
else ()
list(APPEND SLIC3R_GUI_SOURCES
GUI/AVVideoDecoder.cpp
GUI/AVVideoDecoder.hpp
GUI/wxMediaCtrl3.cpp
GUI/wxMediaCtrl3.h
)
endif () endif ()
set(ORCA_UPDATER_SIG_KEY_B64 "${ORCA_UPDATER_SIG_KEY}") set(ORCA_UPDATER_SIG_KEY_B64 "${ORCA_UPDATER_SIG_KEY}")