Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-07-01 00:35:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fine apple

Browse source
This commit is contained in:
lizzie 2026-05-20 18:33:04 +00:00
parent 197bc3a9b9
commit 11b02dd952
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
externals/ffmpeg/CMakeLists.txt vendored
View file

@ -269,13 +269,9 @@ else()
# `--disable-vdpau` is needed to avoid linking issues # `--disable-vdpau` is needed to avoid linking issues
set(FFmpeg_CC ${CMAKE_C_COMPILER_LAUNCHER} ${CMAKE_C_COMPILER}) set(FFmpeg_CC ${CMAKE_C_COMPILER_LAUNCHER} ${CMAKE_C_COMPILER})
set(FFmpeg_CXX ${CMAKE_CXX_COMPILER_LAUNCHER} ${CMAKE_CXX_COMPILER}) set(FFmpeg_CXX ${CMAKE_CXX_COMPILER_LAUNCHER} ${CMAKE_CXX_COMPILER})
# A C++ compiler ought to make C++ binaries, unfortunely using raw `ld` often if (FFmpeg_IS_CROSS_COMPILING)
# doesn't properly link libc/libstdc++, we don't exactly have `LD_C + LD_CXX` to diff list(APPEND FFmpeg_CROSS_COMPILE_FLAGS --ld=${CMAKE_LINKER})
# between them, so use the C++ compiler wrapper launcher as a form of.. well... endif ()
# avoiding the issue of stdc++ not being linked, yes, this affects C libraries
# but due to the fact 99% of LD linkers use GC nowadays, this basically should resolve
# into a nop, MSVC untested.
set(FFmpeg_LD ${CMAKE_CXX_COMPILER_LAUNCHER} ${CMAKE_CXX_COMPILER})
add_custom_command( add_custom_command(
OUTPUT OUTPUT
${FFmpeg_MAKEFILE} ${FFmpeg_MAKEFILE}
@ -296,7 +292,6 @@ else()
--enable-pic --enable-pic
--cc=${FFmpeg_CC} --cc=${FFmpeg_CC}
--cxx=${FFmpeg_CXX} --cxx=${FFmpeg_CXX}
--ld=${FFmpeg_LD}
--extra-cflags=${CMAKE_C_FLAGS} --extra-cflags=${CMAKE_C_FLAGS}
--extra-cxxflags=${CMAKE_CXX_FLAGS} --extra-cxxflags=${CMAKE_CXX_FLAGS}
--extra-ldflags=${CMAKE_C_LINK_FLAGS} --extra-ldflags=${CMAKE_C_LINK_FLAGS}