Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build with CMake Android toolchain.

Browse source
This commit is contained in:
Ghislain MARY 2017-03-08 13:17:48 +01:00
parent 6aa1d4d48f
commit 7ad3c82060
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
submodules/externals/build/ffmpeg/CMakeLists.txt vendored
View file

@ -31,11 +31,11 @@ find_library(AVUTIL_LIBRARY avutil)
find_library(SWRESAMPLE_LIBRARY swresample) find_library(SWRESAMPLE_LIBRARY swresample)
find_library(SWSCALE_LIBRARY swscale) find_library(SWSCALE_LIBRARY swscale)
add_library(ffmpeg-linphone-${NDK_ARCHITECTURE} SHARED) add_library(ffmpeg-linphone-${CMAKE_ANDROID_ARCH_ABI} 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") 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-${NDK_ARCHITECTURE} PROPERTIES LINKER_LANGUAGE C) 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} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}