Skip to content

Commit

Permalink
Fix ffmpeg configure option for Android
Browse files Browse the repository at this point in the history
  • Loading branch information
glennguy authored and phunkyfish committed May 19, 2022
1 parent 62008d3 commit c6de114
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion depends/common/ffmpeg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ if(NOT WIN32)
endif()

if(CMAKE_EXE_LINKER_FLAGS)
if(CORE_SYSTEM_NAME STREQUAL android)
string(APPEND CMAKE_EXE_LINKER_FLAGS " -L${CMAKE_INSTALL_PREFIX}/lib")
endif()
list(APPEND EXTRA_CONF --extra-ldflags=${CMAKE_EXE_LINKER_FLAGS})
endif()

Expand Down Expand Up @@ -100,7 +103,7 @@ if(NOT WIN32)
else()
list(APPEND EXTRA_CONF --cpu=i686 --disable-mmx)
endif()
list(APPEND EXTRA_CONF --target-os=linux --extra-libs=-liconv --disable-linux-perf)
list(APPEND EXTRA_CONF --target-os=android --extra-libs=-liconv --disable-linux-perf)
elseif(CORE_SYSTEM_NAME STREQUAL darwin_embedded)
if(NOT CPU MATCHES arm64)
list(APPEND EXTRA_CONF --cpu=cortex-a8)
Expand Down

0 comments on commit c6de114

Please sign in to comment.