Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-06-28 22:45:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixup make program

Browse source
This commit is contained in:
lizzie 2026-06-09 21:52:13 +00:00
parent 161b97417b
commit 6247795f12
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
externals/ffmpeg/CMakeLists.txt vendored
View file

@ -327,14 +327,10 @@ else()
set(FFmpeg_BUILD_LIBRARIES ${FFmpeg_LIBRARIES}) set(FFmpeg_BUILD_LIBRARIES ${FFmpeg_LIBRARIES})
# Can be found as either "gnumake" or "gmake" find_program(MAKE_PROGRAM NAMES gmake gnumake GNUmake)
find_program(MAKE gnumake) if (MAKE_PROGRAM_FOUND AND SYSTEM_THREADS GREATER 1)
if (NOT MAKE_FOUND)
find_program(MAKE gmake)
endif()
if (MAKE_FOUND AND SYSTEM_THREADS GREATER 1)
# This version of make (GNU's make) supports subprocess threading jobs # This version of make (GNU's make) supports subprocess threading jobs
set(FFmpeg_MAKE_ARGS -j ${SYSTEM_THREADS}) set(FFmpeg_MAKE_ARGS -j${SYSTEM_THREADS})
else() else()
# No GNU make implies that this system may be highly non-GNU # No GNU make implies that this system may be highly non-GNU
find_program(MAKE make required) find_program(MAKE make required)
@ -345,7 +341,7 @@ else()
OUTPUT OUTPUT
${FFmpeg_BUILD_LIBRARIES} ${FFmpeg_BUILD_LIBRARIES}
COMMAND COMMAND
${MAKE} ${FFmpeg_MAKE_ARGS} ${MAKE_PROGRAM} ${FFmpeg_MAKE_ARGS}
WORKING_DIRECTORY WORKING_DIRECTORY
${FFmpeg_BUILD_DIR} ${FFmpeg_BUILD_DIR}
) )