Conflicts:
mediastreamer2
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
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*)
-Subproject commit bc1d91a891a04858b43d6e08fa1136d2c3b9c6a2
+Subproject commit 02dc872f0f85986b7691b4ac911da7825f185a3e