Fixed:compile ffmpeg bug.
This commit is contained in:
parent
04243196d3
commit
c434f4fbe4
6
external/ffmpeg/CMakeLists.txt
vendored
6
external/ffmpeg/CMakeLists.txt
vendored
|
@ -5,7 +5,6 @@ if(NOT NASM)
|
|||
message("nasm not found. Now install.")
|
||||
execute_process(COMMAND sudo apt install nasm WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/)
|
||||
endif()
|
||||
if(${TARGET_PLATFORM} MATCHES ${DEFINE_LINUX})
|
||||
set(FFMPEG_COMMON_CONFIG "--enable-cross-compile --target-os=linux \
|
||||
--cc=${CMAKE_C_COMPILER} \
|
||||
--cxx=${CMAKE_CXX_COMPILER} \
|
||||
|
@ -24,11 +23,10 @@ if(${TARGET_PLATFORM} MATCHES ${DEFINE_LINUX})
|
|||
--extra-libs=-lm \
|
||||
--extra-cflags=\"-I${EXTERNAL_LIBS_OUTPUT_PATH}/fdk-aac/include\" \
|
||||
--extra-ldflags=\"-L${EXTERNAL_LIBS_OUTPUT_PATH}/fdk-aac/lib\"")
|
||||
endif()
|
||||
if(${TARGET_PLATFORM} MATCHES ${DEFINE_LINUX})
|
||||
set(CONFIGURE_COMMAND "--arch=x86_64 ${FFMPEG_COMMON_CONFIG}")
|
||||
set(CONFIGURE_COMMAND "${FFMPEG_COMMON_CONFIG} --arch=x86_64")
|
||||
else()
|
||||
set(CONFIGURE_COMMAND "--arch=arm64 --disable-asm ${FFMPEG_COMMON_CONFIG}")
|
||||
set(CONFIGURE_COMMAND "${FFMPEG_COMMON_CONFIG} --arch=arm64 --disable-asm")
|
||||
endif()
|
||||
message("Compile ffmpeg comand : ${CONFIGURE_COMMAND}")
|
||||
add_custom_command(
|
||||
|
|
Loading…
Reference in New Issue
Block a user