Commit c1ef3535 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix build of ffmpeg and opus for IOS armv7.

parent fcc8df3d
...@@ -95,6 +95,8 @@ else() ...@@ -95,6 +95,8 @@ else()
"--ar=\$AR" "--ar=\$AR"
"--cc=\$CC" "--cc=\$CC"
"--nm=\$NM" "--nm=\$NM"
"--extra-cflags=\$CFLAGS"
"--extra-ldflags=\$LDFLAGS"
) )
set(EP_ffmpeg_MAKE_OPTIONS "RANLIB=\"\$RANLIB\"") set(EP_ffmpeg_MAKE_OPTIONS "RANLIB=\"\$RANLIB\"")
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
......
...@@ -58,6 +58,8 @@ else() ...@@ -58,6 +58,8 @@ else()
endif() endif()
if(ENABLE_ASM) if(ENABLE_ASM)
set(CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS})
set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> ${CMAKE_ASM_FLAGS} -o <OBJECT> -c <SOURCE>")
enable_language(ASM) enable_language(ASM)
string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} SYSTEM_PROCESSOR) string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} SYSTEM_PROCESSOR)
if(SYSTEM_PROCESSOR MATCHES "^arm.*") if(SYSTEM_PROCESSOR MATCHES "^arm.*")
...@@ -150,6 +152,9 @@ include_directories( ...@@ -150,6 +152,9 @@ include_directories(
if(WIN32) if(WIN32)
include_directories(win32) include_directories(win32)
endif() endif()
if (APPLE)
set(ARM2GNU_PARAMS "--apple")
endif()
set(CELT_SOURCES set(CELT_SOURCES
...@@ -187,7 +192,7 @@ if(OPUS_ARM_EXTERNAL_ASM) ...@@ -187,7 +192,7 @@ if(OPUS_ARM_EXTERNAL_ASM)
) )
set_source_files_properties(${CELT_SOURCES_EXTERNAL_ARM_ASM} PROPERTIES GENERATED TRUE) set_source_files_properties(${CELT_SOURCES_EXTERNAL_ARM_ASM} PROPERTIES GENERATED TRUE)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/celt/arm/celt_pitch_xcorr_arm-gnu.S add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/celt/arm/celt_pitch_xcorr_arm-gnu.S
COMMAND "${PERL_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/celt/arm/arm2gnu.pl" "<" "${CELT_SOURCES_ARM_ASM}" ">" "${CELT_SOURCES_EXTERNAL_ARM_ASM}") COMMAND "${PERL_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/celt/arm/arm2gnu.pl" ${ARM2GNU_PARAMS} "<" "${CELT_SOURCES_ARM_ASM}" ">" "${CELT_SOURCES_EXTERNAL_ARM_ASM}")
endif() endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/celt/arm/armopts.s.in ${CMAKE_CURRENT_BINARY_DIR}/celt/arm/armopts.s @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/celt/arm/armopts.s.in ${CMAKE_CURRENT_BINARY_DIR}/celt/arm/armopts.s @ONLY)
...@@ -200,7 +205,7 @@ if(OPUS_ARM_EXTERNAL_ASM) ...@@ -200,7 +205,7 @@ if(OPUS_ARM_EXTERNAL_ASM)
) )
set_source_files_properties(${CELT_AM_SOURCES_EXTERNAL_ARM_ASM} PROPERTIES GENERATED TRUE) set_source_files_properties(${CELT_AM_SOURCES_EXTERNAL_ARM_ASM} PROPERTIES GENERATED TRUE)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/celt/arm/armopts-gnu.S add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/celt/arm/armopts-gnu.S
COMMAND "${PERL_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/celt/arm/arm2gnu.pl" "<" "${CELT_AM_SOURCES_ARM_ASM}" ">" "${CELT_AM_SOURCES_EXTERNAL_ARM_ASM}") COMMAND "${PERL_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/celt/arm/arm2gnu.pl" ${ARM2GNU_PARAMS} "<" "${CELT_AM_SOURCES_ARM_ASM}" ">" "${CELT_AM_SOURCES_EXTERNAL_ARM_ASM}")
endif() endif()
set(SILK_SOURCES set(SILK_SOURCES
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment