diff options
-rwxr-xr-x | aconfigure | 10 | ||||
-rw-r--r-- | aconfigure.ac | 10 | ||||
-rwxr-xr-x | configure-iphone | 2 | ||||
-rw-r--r-- | pjsip-apps/build/Makefile | 4 |
4 files changed, 13 insertions, 13 deletions
@@ -5708,7 +5708,7 @@ case $target in *) ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o" case $target in - *-apple-darwin*) + *-apple-darwin_ios*) ac_os_objs="$ac_os_objs os_info_iphone.o" ;; esac @@ -6065,7 +6065,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... OpenSL ES" >&5 $as_echo "Checking sound device backend... OpenSL ES" >&6; } ;; - *-apple-darwin*) + *-apple-darwin_ios*) LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox -framework CFNetwork -framework UIKit" ac_pjmedia_audiodev_objs="coreaudio_dev.o" { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... AudioUnit" >&5 @@ -6151,7 +6151,7 @@ case $target in *android*) LIBS="$LIBS -llog" ;; - *-apple-darwin*) + *-apple-darwin_ios*) LIBS="$LIBS -framework UIKit" ;; *darwin*) @@ -6199,7 +6199,7 @@ $as_echo "Checking if OpenGL ES 2 is available... no" >&6; } fi ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1" ;; - *-apple-darwin*) + *-apple-darwin_ios*) ac_pjmedia_video=iphone_os @@ -7233,7 +7233,7 @@ else LIBYUV_CFLAGS="-I$LIBYUV_PREFIX/include" case $target in - *-apple-darwin*) + *-apple-darwin_ios*) LIBYUV_LDFLAGS="-L$LIBYUV_PREFIX/out_ios/Release-iphoneos" case $ARCH in *arm*) diff --git a/aconfigure.ac b/aconfigure.ac index b9793b70..179dfac2 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -446,7 +446,7 @@ case $target in *) ac_os_objs="$ac_os_objs file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o" case $target in - *-apple-darwin*) + *-apple-darwin_ios*) ac_os_objs="$ac_os_objs os_info_iphone.o" ;; esac @@ -623,7 +623,7 @@ else LIBS="$LIBS -lOpenSLES" AC_MSG_RESULT([Checking sound device backend... OpenSL ES]) ;; - *-apple-darwin*) + *-apple-darwin_ios*) LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox -framework CFNetwork -framework UIKit" ac_pjmedia_audiodev_objs="coreaudio_dev.o" AC_MSG_RESULT([Checking sound device backend... AudioUnit]) @@ -695,7 +695,7 @@ case $target in *android*) LIBS="$LIBS -llog" ;; - *-apple-darwin*) + *-apple-darwin_ios*) LIBS="$LIBS -framework UIKit" ;; *darwin*) @@ -724,7 +724,7 @@ else fi ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1" ;; - *-apple-darwin*) + *-apple-darwin_ios*) ac_pjmedia_video=iphone_os AC_SUBST(ac_pjmedia_video_has_ios) AC_SUBST(ac_ios_cflags) @@ -1207,7 +1207,7 @@ AC_ARG_ENABLE(libyuv, LIBYUV_CFLAGS="-I$LIBYUV_PREFIX/include" case $target in - *-apple-darwin*) + *-apple-darwin_ios*) LIBYUV_LDFLAGS="-L$LIBYUV_PREFIX/out_ios/Release-iphoneos" case $ARCH in *arm*) diff --git a/configure-iphone b/configure-iphone index fa832970..cf399189 100755 --- a/configure-iphone +++ b/configure-iphone @@ -146,7 +146,7 @@ if test "1" = "1"; then fi # And finally invoke the configure script itself -./aconfigure --host=${ARCH_VAL}-apple-darwin --disable-sdl $* +./aconfigure --host=${ARCH_VAL}-apple-darwin_ios --disable-sdl $* if test "$?" = "0"; then echo "Done configuring for `basename $SDKPATH`" diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile index a3c7386b..49ff2d70 100644 --- a/pjsip-apps/build/Makefile +++ b/pjsip-apps/build/Makefile @@ -67,7 +67,7 @@ distclean: realclean pjsua: $(PJSUA_EXE) $(PJSUA_EXE): $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(subst /,$(HOST_PSEP),$(BINDIR)/$@) - @if echo "$(TARGET_NAME)" | grep -q "apple-darwin$$"; then \ + @if echo "$(TARGET_NAME)" | grep -q "apple-darwin_ios$$"; then \ for F in $(filter %$(TARGET_NAME).a,$(PJ_LIBXX_FILES)); do \ if test -f $$F; then \ tmp=`echo $${F##*/} | sed -e "s/\-$(TARGET_NAME)\.a/.a/"`; \ @@ -95,7 +95,7 @@ clean depend realclean: echo '$(BINDIR)/$(PJSUA_EXE): $(APP_LIB_FILES)' >> .pjsua-$(TARGET_NAME).depend; \ echo '$(BINDIR)/$(PJSYSTEST_EXE): $(APP_LIB_FILES)' >> .pjsystest-$(TARGET_NAME).depend; \ fi - @if echo "$(TARGET_NAME)" | grep -q "apple-darwin$$"; then \ + @if echo "$(TARGET_NAME)" | grep -q "apple-darwin_ios$$"; then \ for F in $(filter %$(TARGET_NAME).a,$(PJ_LIBXX_FILES)); do \ tmp=`echo $${F##*/} | sed -e "s/\-$(TARGET_NAME)\.a/.a/"`; \ rm -f ../src/pjsua/ios/$$tmp; \ |