diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-16 13:13:21 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-16 13:13:47 +0200 |
commit | 8a4a84a70a2e0bcfadcc955493c94be8f3ca8ce9 (patch) | |
tree | 9b59d06945bb5b3b022b16128099fb702fd0f8d4 | |
parent | 60058c1880f2260ad8a900d54a89a3f2cb4aa4ac (diff) | |
parent | 83aa4fc3feec7389ac781fece1e994f2dfd7ebdb (diff) | |
download | ffmpeg-8a4a84a70a2e0bcfadcc955493c94be8f3ca8ce9.tar.gz |
Merge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb'
* commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb':
configure: Directly support Android as target OS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-x | configure | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -3868,6 +3868,13 @@ case $target_os in add_cppflags '-I\$(SRC_PATH)/compat/aix' enabled shared && add_ldflags -Wl,-brtl ;; + android) + disable symver + SLIB_INSTALL_NAME='$(SLIBNAME)' + SLIB_INSTALL_LINKS= + # soname not set on purpose + SHFLAGS=-shared + ;; haiku) prefix_default="/boot/common" network_extralibs="-lnetwork" |