From 0d7cddbc36b310c6d87d4057312cbed2d218da44 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 12 Mar 2015 09:12:10 +0100 Subject: [PATCH 1/3] linphone.xcodeproj: update deployment target from 4.3 to 6.0 --- linphone.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 5544044ec..54d20b3ae 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -4574,7 +4574,7 @@ GCC_WARN_UNUSED_FUNCTION = NO; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = ""; PROVISIONING_PROFILE = "0636A6EA-90EB-4D92-B707-19FC32F9A7CF"; SDKROOT = iphoneos; @@ -4657,7 +4657,7 @@ GCC_WARN_UNUSED_FUNCTION = NO; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = ""; PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; @@ -4739,7 +4739,7 @@ GCC_WARN_UNUSED_FUNCTION = NO; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = ""; PROVISIONING_PROFILE = "C7F794BC-6D48-41F2-B37D-E1B1B1A40901"; SDKROOT = iphoneos; @@ -4822,7 +4822,7 @@ GCC_WARN_UNUSED_FUNCTION = NO; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; PROVISIONING_PROFILE = "2AC0DC11-4546-47B6-8B8A-453CCA80903C"; From bda80082c9483d1570f0d903a333442f1ff3d6bc Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 12 Mar 2015 09:49:41 +0100 Subject: [PATCH 2/3] README.md: fix typo in README and improve check_tools a bit --- README.md | 2 +- Tools/check_tools.sh | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e21aa1a96..6b1f61266 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Linphone for iPhone depends on liblinphone SDK. This SDK is generated from makef * Using MacPorts: - sudo port install autoconf automake pkg-config doxygen antlr3 java nasm gettext wget yasm optipng ImageMagick coreutils intltool + sudo port install autoconf automake pkgconfig doxygen antlr3 nasm gettext wget yasm optipng ImageMagick coreutils intltool ### System linking diff --git a/Tools/check_tools.sh b/Tools/check_tools.sh index 66bd67a2a..488893400 100755 --- a/Tools/check_tools.sh +++ b/Tools/check_tools.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash error_on_quit=0 @@ -17,7 +17,6 @@ check_installed() { cd $(dirname $0)/.. -#autoconf pkg-config java ant yasm nasm wget for prog in autoconf automake pkg-config doxygen java nasm gettext wget yasm optipng; do check_installed "$prog" "it" done @@ -26,13 +25,20 @@ check_installed "ginstall" "coreutils" check_installed "intltoolize" "intltool" check_installed "convert" "imagemagick" -if ! check_installed "libtoolize" "libtool"; then - if [ ! -z "$(which glibtoolize)" ]; then - echo_err "Note: it seems that you are using HomeBrew. Please do a symbolic link from " \ - "glibtoolize to libtoolize: 'ln -s $(which glibtoolize) /usr/local/bin/libtoolize'" +if [ -z "$(which libtoolize)" ]; then + glibtoolize=$(which glibtoolize) + if [ ! -z "$glibtoolize" ]; then + echo_err "Please do a symbolic link from glibtoolize to libtoolize: 'ln -s $glibtoolize ${glibtoolize/glibtoolize/libtoolize}'" + else + echo_err "Could not find libtoolize. Please install libtool." fi fi +# just ensure that JDK is installed - if not, it will display user a popup +if ! java -version &>/dev/null; then + echo_err "Please install Java" +fi + # needed by x264 check_installed "gas-preprocessor.pl" "it following the README.md" From dbbf570ea4a1f79295ba1d63940fd9d919cd5dc6 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 12 Mar 2015 10:18:48 +0100 Subject: [PATCH 3/3] linphone.xcodeproj: target LinphoneTester devices set from iPhone to universal --- linphone.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 54d20b3ae..8bc0f9ab7 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -5090,7 +5090,7 @@ ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -5139,7 +5139,7 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; WRAPPER_EXTENSION = app; }; @@ -5189,7 +5189,7 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; WRAPPER_EXTENSION = app; }; @@ -5239,7 +5239,7 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - TARGETED_DEVICE_FAMILY = 1; + TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; WRAPPER_EXTENSION = app; };