add armv7s support for IOS

Conflicts:

	mediastreamer2
This commit is contained in:
Jehan Monnier 2012-09-18 08:21:51 +02:00
parent a1961faa44
commit 296b5671ae
3 changed files with 3 additions and 9 deletions

View file

@ -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

View file

@ -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*)

@ -1 +1 @@
Subproject commit bc1d91a891a04858b43d6e08fa1136d2c3b9c6a2
Subproject commit 02dc872f0f85986b7691b4ac911da7825f185a3e