From df490e5ae4a540833c2886928e1ca726b79a0a41 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Fri, 6 Nov 2015 10:03:39 +0100 Subject: [PATCH] xcode: fix liblinphone project --- linphone.xcodeproj/project.pbxproj | 16 ++++++++-------- prepare.py | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 746301884..cc3cb506d 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -4401,8 +4401,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; @@ -4457,8 +4457,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; @@ -4507,8 +4507,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; @@ -4557,8 +4557,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; diff --git a/prepare.py b/prepare.py index fd98311aa..c97fbedfc 100755 --- a/prepare.py +++ b/prepare.py @@ -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 @@ -212,7 +212,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")))