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

prepare.py: allow Xcode target and fix Tutorial project

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-09-29 13:45:09 +02:00
parent 32bb0cff80
commit 1d3f1e56cf
4 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
TutorialHellowWorld/hello-world.xcodeproj/project.pbxproj
View file

@ -65,7 +65,6 @@
63D5C13B1BA6E504002D1ABF /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1171BA6E4F0002D1ABF /* libopus.a */; };
63D5C13C1BA6E504002D1ABF /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1181BA6E4F0002D1ABF /* libortp.a */; };
63D5C13D1BA6E504002D1ABF /* libpolarssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C1191BA6E4F0002D1ABF /* libpolarssl.a */; };
63D5C13E1BA6E504002D1ABF /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11A1BA6E4F0002D1ABF /* libSKP_SILK_SDK.a */; };
63D5C13F1BA6E504002D1ABF /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11B1BA6E4F0002D1ABF /* libspeex.a */; };
63D5C1401BA6E504002D1ABF /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11C1BA6E4F0002D1ABF /* libspeexdsp.a */; };
63D5C1411BA6E504002D1ABF /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D5C11D1BA6E4F0002D1ABF /* libsrtp.a */; };
@ -294,7 +293,6 @@
63D5C13B1BA6E504002D1ABF /* libopus.a in Frameworks */,
63D5C13C1BA6E504002D1ABF /* libortp.a in Frameworks */,
63D5C13D1BA6E504002D1ABF /* libpolarssl.a in Frameworks */,
63D5C13E1BA6E504002D1ABF /* libSKP_SILK_SDK.a in Frameworks */,
63D5C13F1BA6E504002D1ABF /* libspeex.a in Frameworks */,
63D5C1401BA6E504002D1ABF /* libspeexdsp.a in Frameworks */,
63D5C1411BA6E504002D1ABF /* libsrtp.a in Frameworks */,
@ -790,8 +788,8 @@
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
"../liblinphone-sdk/apple-darwin/lib",
"../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
);
PRODUCT_NAME = "hello-world";
SDKROOT = iphoneos;
@ -810,8 +808,8 @@
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
"../liblinphone-sdk/apple-darwin/lib",
"../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
);
PRODUCT_NAME = "hello-world";
SDKROOT = iphoneos;
@ -833,8 +831,8 @@
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
"../liblinphone-sdk/apple-darwin/lib",
"../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
);
PRODUCT_NAME = "hello-world";
SDKROOT = iphoneos;
@ -853,8 +851,8 @@
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
"../liblinphone-sdk/apple-darwin/lib",
"../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins",
);
PRODUCT_NAME = "hello-world";
SDKROOT = iphoneos;
@ -876,7 +874,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
"../liblinphone-sdk/apple-darwin/lib",
);
PRODUCT_NAME = "hello-world";
SDKROOT = iphoneos;
@ -895,7 +893,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
"../liblinphone-sdk/apple-darwin/lib",
);
PRODUCT_NAME = "hello-world";
SDKROOT = iphoneos;
@ -917,7 +915,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
"../liblinphone-sdk/apple-darwin/lib",
);
PRODUCT_NAME = "hello-world";
SDKROOT = iphoneos;
@ -936,7 +934,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"/Users/gpelloux/code/ios/linphone-iphone/liblinphone-sdk/apple-darwin/lib",
"../liblinphone-sdk/apple-darwin/lib",
);
PRODUCT_NAME = "hello-world";
SDKROOT = iphoneos;
@ -949,13 +947,14 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
ENABLE_BITCODE = NO;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../liblinphone-sdk/apple-darwin/include";
HEADER_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/include";
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib";
LIBRARY_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/lib";
PREBINDING = NO;
SDKROOT = iphoneos;
};
@ -966,12 +965,13 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
ENABLE_BITCODE = NO;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../liblinphone-sdk/apple-darwin/include";
HEADER_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/include";
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib";
LIBRARY_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/lib";
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PREBINDING = NO;
SDKROOT = iphoneos;

21
prepare.py
View file

@ -482,7 +482,7 @@ def main(argv=None):
argparser.add_argument(
'--enable-non-free-codecs', help="Enable non-free codecs such as OpenH264, MPEG4, etc.. Final application must comply with their respective license (see README.md).", action='store_true')
argparser.add_argument(
'-G' '--generator', help="CMake build system generator (default: Unix Makefiles).", default='Unix Makefiles', choices=['Unix Makefiles', 'Ninja'], dest='generator')
'-G' '--generator', help="CMake build system generator (default: Unix Makefiles, use cmake -h to get the complete list).", default='Unix Makefiles', dest='generator')
argparser.add_argument(
'-L', '--list-cmake-variables', help="List non-advanced CMake cache variables.", action='store_true', dest='list_cmake_variables')
argparser.add_argument(
@ -495,12 +495,6 @@ def main(argv=None):
args, additional_args = argparser.parse_known_args()
additional_args += ["-G", args.generator]
if args.generator == 'Ninja':
if not check_is_installed("ninja", "it"):
return 1
generator = 'ninja -C'
else:
generator = '$(MAKE) -C'
if check_tools() != 0:
return 1
@ -578,7 +572,18 @@ def main(argv=None):
os.remove('Makefile')
elif selected_platforms:
install_git_hook()
generate_makefile(selected_platforms, generator)
# only generated makefile if we are using Ninja or Makefile
if args.generator == 'Ninja':
if not check_is_installed("ninja", "it"):
return 1
generate_makefile(selected_platforms, 'ninja -C')
elif args.generator == "Unix Makefiles":
generate_makefile(selected_platforms, '$(MAKE) -C')
elif args.generator == "Xcode":
print("You can now open Xcode project with: open WORK/cmake/Project.xcodeproj")
else:
print("Not generating meta-makefile for generator {}.".format(args.generator))
return 0

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 9bf1eecf12bb8a0884025d35de9b50b0875b9ecc
Subproject commit 12d21dbb2ac58dff25b0ca1c66654234b526a429

2
submodules/linphone

@ -1 +1 @@
Subproject commit f582965b14e8b777db47d52634ba518ec33cae23
Subproject commit fcc39924ffa45037f83b2217a2f84ddabe962b30