From 7ad3c8206003447137ecd042fd394bd964a1af95 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 8 Mar 2017 13:17:48 +0100 Subject: [PATCH] Fix build with CMake Android toolchain. --- submodules/externals/build/ffmpeg/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/submodules/externals/build/ffmpeg/CMakeLists.txt b/submodules/externals/build/ffmpeg/CMakeLists.txt index db7714a35..6cab7512c 100644 --- a/submodules/externals/build/ffmpeg/CMakeLists.txt +++ b/submodules/externals/build/ffmpeg/CMakeLists.txt @@ -31,11 +31,11 @@ find_library(AVUTIL_LIBRARY avutil) find_library(SWRESAMPLE_LIBRARY swresample) find_library(SWSCALE_LIBRARY swscale) -add_library(ffmpeg-linphone-${NDK_ARCHITECTURE} SHARED) -target_link_libraries(ffmpeg-linphone-${NDK_ARCHITECTURE} LINK_PRIVATE "m" "-Wl,-whole-archive" ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWRESAMPLE_LIBRARY} ${SWSCALE_LIBRARY} "-Wl,-no-whole-archive") -set_target_properties(ffmpeg-linphone-${NDK_ARCHITECTURE} PROPERTIES LINKER_LANGUAGE C) +add_library(ffmpeg-linphone-${CMAKE_ANDROID_ARCH_ABI} SHARED) +target_link_libraries(ffmpeg-linphone-${CMAKE_ANDROID_ARCH_ABI} LINK_PRIVATE "m" "-Wl,-whole-archive" ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWRESAMPLE_LIBRARY} ${SWSCALE_LIBRARY} "-Wl,-no-whole-archive") +set_target_properties(ffmpeg-linphone-${CMAKE_ANDROID_ARCH_ABI} PROPERTIES LINKER_LANGUAGE C) -install(TARGETS ffmpeg-linphone-${NDK_ARCHITECTURE} +install(TARGETS ffmpeg-linphone-${CMAKE_ANDROID_ARCH_ABI} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}