mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-08-30 05:17:19 +00:00
build: drop redundant --enable-shared in FFmpeg deps configure
The literal --enable-shared was always overridden by ${_link_cmd}
(--enable-static --disable-shared on Apple, --enable-shared elsewhere)
and FFmpeg configure processes these flags in order, last one wins.
Remove it and the stale comment documenting the workaround.
Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
2
deps/FFMPEG/FFMPEG.cmake
vendored
2
deps/FFMPEG/FFMPEG.cmake
vendored
@@ -27,7 +27,6 @@ else ()
|
|||||||
"--extra-ldflags=-mmacosx-version-min=${DEP_OSX_TARGET}"
|
"--extra-ldflags=-mmacosx-version-min=${DEP_OSX_TARGET}"
|
||||||
)
|
)
|
||||||
# Static FFmpeg: nothing to bundle into the .app, no rpath handling.
|
# Static FFmpeg: nothing to bundle into the .app, no rpath handling.
|
||||||
# Shared flags must come AFTER --enable-shared below so they win.
|
|
||||||
set(_link_cmd --enable-static --disable-shared)
|
set(_link_cmd --enable-static --disable-shared)
|
||||||
if (IS_CROSS_COMPILE)
|
if (IS_CROSS_COMPILE)
|
||||||
set(_cross_cmd --enable-cross-compile)
|
set(_cross_cmd --enable-cross-compile)
|
||||||
@@ -59,7 +58,6 @@ else ()
|
|||||||
${_arch_cmd}
|
${_arch_cmd}
|
||||||
${_cc_cmd}
|
${_cc_cmd}
|
||||||
"--prefix=${DESTDIR}"
|
"--prefix=${DESTDIR}"
|
||||||
--enable-shared
|
|
||||||
${_link_cmd}
|
${_link_cmd}
|
||||||
${_minos_cmd}
|
${_minos_cmd}
|
||||||
--disable-doc
|
--disable-doc
|
||||||
|
|||||||
Reference in New Issue
Block a user