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

xcode: fix liblinphone project

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-11-06 10:03:39 +01:00
parent 40eb000b98
commit bde275fa44
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
linphone.xcodeproj/project.pbxproj
View file

@ -5127,8 +5127,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
ASSETCATALOG_COMPILER_APPICON_NAME = TestAppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = TestLaunchImage;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
@ -5179,8 +5179,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
ASSETCATALOG_COMPILER_APPICON_NAME = TestAppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = TestLaunchImage;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
@ -5225,8 +5225,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
ASSETCATALOG_COMPILER_APPICON_NAME = TestAppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = TestLaunchImage;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
@ -5271,8 +5271,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
ASSETCATALOG_COMPILER_APPICON_NAME = TestAppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = TestLaunchImage;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;

6
prepare.py
View file

@ -28,7 +28,7 @@ import re
import shutil
import tempfile
import sys
from logging import *
from logging import error, warning, info, INFO, basicConfig
from distutils.spawn import find_executable
from subprocess import Popen, PIPE
sys.dont_write_bytecode = True
@ -210,7 +210,7 @@ def check_tools():
if check_is_installed("libtoolize", warn=False):
if not check_is_installed("glibtoolize", "libtool"):
glibtoolize_path = find_executable(glibtoolize)
glibtoolize_path = find_executable("glibtoolize")
reterr = 1
msg = "Please do a symbolic link from glibtoolize to libtoolize:\n\tln -s {} ${}"
error(msg.format(glibtoolize_path, glibtoolize_path.replace("glibtoolize", "libtoolize")))
@ -509,7 +509,7 @@ def main(argv=None):
info("Tunnel wanted but not found yet, trying to clone it...")
p = Popen("git clone gitosis@git.linphone.org:tunnel.git submodules/tunnel".split(" "))
p.wait()
if p.retcode != 0:
if p.returncode != 0:
error("Could not clone tunnel. Please see http://www.belledonne-communications.com/voiptunnel.html")
return 1
warning("Tunnel enabled, disabling GPL third parties.")