witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Merge remote-tracking branch 'origin/master' into x86_64

Browse source
This commit is contained in:
Guillaume BIENKOWSKI 2015-03-12 13:41:24 +01:00
commit 2718e8a7e9
3 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

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

18
Tools/check_tools.sh
View file

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

16
linphone.xcodeproj/project.pbxproj
View file

@ -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";
@ -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;
};