From 296b5671ae42dbfbb28e1c30e8c79ecdbe60ebc5 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 18 Sep 2012 08:21:51 +0200 Subject: [PATCH] add armv7s support for IOS Conflicts: mediastreamer2 --- configure.ac | 2 +- m4/exosip.m4 | 8 +------- mediastreamer2 | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 6e68f7ba..4c4bab88 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,7 @@ case $target in CONSOLE_FLAGS="-mconsole" mingw_found=yes ;; - armv6-apple-darwin|armv7-apple-darwin|i386-apple-darwin) + armv6-apple-darwin|armv7-apple-darwin|i386-apple-darwin|armv7s-apple-darwin) CFLAGS="$CFLAGS -DTARGET_OS_IPHONE " build_tests=no ios_found=yes diff --git a/m4/exosip.m4 b/m4/exosip.m4 index 129b2857..aa4b7a9c 100644 --- a/m4/exosip.m4 +++ b/m4/exosip.m4 @@ -5,13 +5,7 @@ AC_REQUIRE([LP_CHECK_OSIP2]) case $host_alias in - i386-apple*) - OSIP_LIBS="$OSIP_LIBS -framework CoreFoundation -framework CFNetwork -lresolv" - ;; - armv6-apple*) - OSIP_LIBS="$OSIP_LIBS -framework CoreFoundation -framework CFNetwork -lresolv" - ;; - armv7-apple*) + i386-apple*|armv6-apple*|armv7-apple*|armv7s-apple*) OSIP_LIBS="$OSIP_LIBS -framework CoreFoundation -framework CFNetwork -lresolv" ;; x86_64-apple*) diff --git a/mediastreamer2 b/mediastreamer2 index bc1d91a8..02dc872f 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit bc1d91a891a04858b43d6e08fa1136d2c3b9c6a2 +Subproject commit 02dc872f0f85986b7691b4ac911da7825f185a3e -- 2.39.2