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

submodules: update bunch of them

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2016-03-01 16:24:04 +01:00
parent e35ae89a57
commit db68f496fd
6 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LiblinphoneTester/MasterView.m
View file

@ -60,7 +60,7 @@ void tester_logs_handler(int level, const char *fmt, va_list args) {
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
documentPath = [paths objectAtIndex:0];
bc_tester_init(tester_logs_handler, ORTP_MESSAGE, ORTP_ERROR);
bc_tester_init(tester_logs_handler, ORTP_MESSAGE, ORTP_ERROR, "rcfiles");
liblinphone_tester_add_suites();
bc_tester_set_resource_dir_prefix([bundlePath UTF8String]);

8
linphone.xcodeproj/project.pbxproj
View file

@ -16,7 +16,6 @@
2214EB7A12F846B1002A5394 /* UICallButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB7912F846B1002A5394 /* UICallButton.m */; };
2214EB8912F84EBB002A5394 /* UIHangUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB8812F84EBB002A5394 /* UIHangUpButton.m */; };
2214EBF312F86360002A5394 /* UIMutedMicroButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EBF212F86360002A5394 /* UIMutedMicroButton.m */; };
22276E8713C73D8A00210156 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8613C73D8A00210156 /* CoreVideo.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
22276E8913C73DC000210156 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8813C73DC000210156 /* CoreMedia.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
22405EEE1600B4E400B92522 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EED1600B4E400B92522 /* AssetsLibrary.framework */; };
22405F001601C19200B92522 /* ImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 22405EFE1601C19100B92522 /* ImageView.m */; };
@ -588,6 +587,8 @@
63CDC45E1C3BDE370085F529 /* msg.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC4531C3BDE370085F529 /* msg.caf */; };
63CDC45F1C3BDE370085F529 /* ringback.wav in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC4541C3BDE370085F529 /* ringback.wav */; };
63CDC4661C3BDE370085F529 /* shortring.caf in Resources */ = {isa = PBXBuildFile; fileRef = 63CDC45C1C3BDE370085F529 /* shortring.caf */; };
63CE58401C85EBF400304800 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63CE583F1C85EBF400304800 /* VideoToolbox.framework */; };
63CE58451C85EC1000304800 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63CE583F1C85EBF400304800 /* VideoToolbox.framework */; };
63CFEDE81B9EDD74007EA5BD /* libantlr3c.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223CA7E416D9255800EF1BEC /* libantlr3c.a */; };
63CFEDE91B9EDD74007EA5BD /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8013C73D3100210156 /* libavcodec.a */; };
63CFEDEA1B9EDD74007EA5BD /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8113C73D3100210156 /* libavutil.a */; };
@ -1499,6 +1500,7 @@
63CDC4531C3BDE370085F529 /* msg.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = msg.caf; sourceTree = "<group>"; };
63CDC4541C3BDE370085F529 /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = ringback.wav; sourceTree = "<group>"; };
63CDC45C1C3BDE370085F529 /* shortring.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = shortring.caf; sourceTree = "<group>"; };
63CE583F1C85EBF400304800 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
63CFEDE21B9EDD36007EA5BD /* libswresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswresample.a; path = "liblinphone-sdk/apple-darwin/lib/libswresample.a"; sourceTree = "<group>"; };
63CFEDE31B9EDD36007EA5BD /* libvo-amrwbenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libvo-amrwbenc.a"; path = "liblinphone-sdk/apple-darwin/lib/libvo-amrwbenc.a"; sourceTree = "<group>"; };
63CFEDE41B9EDD36007EA5BD /* libbcg729.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbcg729.a; path = "liblinphone-sdk/apple-darwin/lib/libbcg729.a"; sourceTree = "<group>"; };
@ -1734,6 +1736,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
63CE58401C85EBF400304800 /* VideoToolbox.framework in Frameworks */,
6375A1FF1C760E17007A24E2 /* libbctoolbox.a in Frameworks */,
63E27A501C50EAE800D332AE /* libcorec.a in Frameworks */,
63E27A4E1C50EAC300D332AE /* libebml2.a in Frameworks */,
@ -1780,7 +1783,6 @@
288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */,
22276E8913C73DC000210156 /* CoreMedia.framework in Frameworks */,
340751971506459A00B89C47 /* CoreTelephony.framework in Frameworks */,
22276E8713C73D8A00210156 /* CoreVideo.framework in Frameworks */,
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
F0B89C2218DC89E30050B60E /* MediaPlayer.framework in Frameworks */,
D37DC7181594AF3400B2A5EB /* MessageUI.framework in Frameworks */,
@ -1813,6 +1815,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
63CE58451C85EC1000304800 /* VideoToolbox.framework in Frameworks */,
6375A2041C761CFC007A24E2 /* libbctoolbox.a in Frameworks */,
63E27A591C51392A00D332AE /* libcorec.a in Frameworks */,
63E27A5A1C51392A00D332AE /* libebml2.a in Frameworks */,
@ -2118,6 +2121,7 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
63CE583F1C85EBF400304800 /* VideoToolbox.framework */,
6375A1FE1C760E17007A24E2 /* libbctoolbox.a */,
63E27A4F1C50EAE800D332AE /* libcorec.a */,
63E27A4D1C50EAC300D332AE /* libebml2.a */,

2
submodules/bctoolbox

@ -1 +1 @@
Subproject commit 98eebe531da3086db68db353f4402fad129339c9
Subproject commit 912a4c36d371d62e6fa94c16e4009546dbdb02eb

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 8da731d1f79f210bb295d59f103ad56cc13f19bd
Subproject commit 54dbbd6f6c52ec371359b45fd5b8b88a6a3b4763

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit ad810068ea1616f1c7cf9665fc5799d56a865da2
Subproject commit c60a98db6dcbbc5c4b0bea65acab7d292e443c5a

2
submodules/linphone

@ -1 +1 @@
Subproject commit 30e504c26342d6a319f4320c3e306c9e6b8fec88
Subproject commit c227e4b26227dd909a8aa3f4ba10f73c2490ef25