From 9a5fd64e504b6ea533d9b85ac785e6440d939bb8 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Sun, 18 Jul 2010 22:09:23 +0200 Subject: [PATCH] add liblinphone and its dependecies as submodules --- .gitmodules | 21 ++++++++ Classes/linphoneAppDelegate.m | 33 ++++++------ linphone.xcodeproj/project.pbxproj | 80 ++++++++++++++---------------- submodules/externals/exosip | 1 + submodules/externals/gsm | 1 + submodules/externals/osip | 1 + submodules/externals/speex | 1 + submodules/libilbc-rfc3951 | 1 + submodules/linphone | 1 + 9 files changed, 80 insertions(+), 60 deletions(-) create mode 100644 .gitmodules create mode 160000 submodules/externals/exosip create mode 160000 submodules/externals/gsm create mode 160000 submodules/externals/osip create mode 160000 submodules/externals/speex create mode 160000 submodules/libilbc-rfc3951 create mode 160000 submodules/linphone diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..833662907 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,21 @@ +[submodule "submodules/linphone"] + path = submodules/linphone + url = git://git.sv.gnu.org/linphone.git +[submodule "submodules/externals/osip"] + path = submodules/externals/osip + url = git://git.savannah.gnu.org/osip.git +[submodule "submodules/externals/exosip"] + path = submodules/externals/exosip + url = git://git.savannah.nongnu.org/exosip.git +[submodule "submodules/externals/gsm"] + path = submodules/externals/gsm + url = git://git.linphone.org/gsm.git +[submodule "submodules/externals/speex"] + path = submodules/externals/speex + url = http://git.xiph.org/speex.git +[submodule "submodules/msilbc"] + path = submodules/msilbc + url = git://git.linphone.org/msilbc.git +[submodule "submodules/libilbc-rfc3951"] + path = submodules/libilbc-rfc3951 + url = git://git.linphone.org/libilbc-rfc3951.git diff --git a/Classes/linphoneAppDelegate.m b/Classes/linphoneAppDelegate.m index fe2458d36..dfeb29ff2 100644 --- a/Classes/linphoneAppDelegate.m +++ b/Classes/linphoneAppDelegate.m @@ -297,22 +297,6 @@ extern void libmsilbc_init(); */ -(void)startlibLinphone { - //init audio session - NSError *setError = nil; - AVAudioSession *audioSession = [AVAudioSession sharedInstance]; - BOOL bAudioInputAvailable= [audioSession inputIsAvailable]; - - if(!bAudioInputAvailable){ - UIAlertView* error = [[UIAlertView alloc] initWithTitle:@"No microphone" - message:@"You need to plug a microphone to your device to use this application." - delegate:self - cancelButtonTitle:@"Ok" - otherButtonTitles:nil ,nil]; - [error show]; - }else{ - [audioSession setCategory: AVAudioSessionCategoryPlayAndRecord error: &setError]; //must be call before linphone_core_init - } - //get default config from bundle NSBundle* myBundle = [NSBundle mainBundle]; NSString* factoryConfig = [myBundle pathForResource:@"linphonerc"ofType:nil] ; @@ -329,8 +313,6 @@ extern void libmsilbc_init(); linphone_core_disable_logs(); } - //register audio queue sound card - ms_au_register_card(); libmsilbc_init(); /* @@ -354,6 +336,21 @@ extern void libmsilbc_init(); selector:@selector(iterate) userInfo:nil repeats:YES]; + //init audio session + NSError *setError = nil; + AVAudioSession *audioSession = [AVAudioSession sharedInstance]; + BOOL bAudioInputAvailable= [audioSession inputIsAvailable]; + + if(!bAudioInputAvailable){ + UIAlertView* error = [[UIAlertView alloc] initWithTitle:@"No microphone" + message:@"You need to plug a microphone to your device to use this application." + delegate:self + cancelButtonTitle:@"Ok" + otherButtonTitles:nil ,nil]; + [error show]; + } + + } -(void) doLinphoneConfiguration:(NSNotification *)notification { diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index e44ac84c2..db84038ae 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -42,7 +42,6 @@ 225CB2EE11ABB65D00628906 /* clavier-01-160px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */; }; 225CB2FA11ABB76400628906 /* linphone-banner.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2F911ABB76400628906 /* linphone-banner.png */; }; 2264B6D211200342002C2C53 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2264B6D111200342002C2C53 /* SystemConfiguration.framework */; }; - 2273785E10A3703300526073 /* libmsiounit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2273785D10A3703300526073 /* libmsiounit.a */; }; 2274401A106F31BD006EC466 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22744019106F31BD006EC466 /* CoreAudio.framework */; }; 2274402F106F335E006EC466 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2274402E106F335E006EC466 /* AudioToolbox.framework */; }; 2274550810700509006EC466 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 2274550710700509006EC466 /* linphonerc */; }; @@ -179,28 +178,28 @@ 220FACE9107654FC0068D98F /* speex_resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_resampler.h; sourceTree = ""; }; 220FACEA107654FC0068D98F /* speex_stereo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_stereo.h; sourceTree = ""; }; 220FACEB107654FC0068D98F /* speex_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_types.h; sourceTree = ""; }; - 220FAD2810765B400068D98F /* libeXosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeXosip2.a; path = "../liblinphone-sdk/apple-darwin/lib/libeXosip2.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2910765B400068D98F /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2A10765B400068D98F /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "../liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2B10765B400068D98F /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "../liblinphone-sdk/apple-darwin/lib/libmediastreamer.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2C10765B400068D98F /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "../liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2D10765B400068D98F /* libosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosip2.a; path = "../liblinphone-sdk/apple-darwin/lib/libosip2.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2E10765B400068D98F /* libosipparser2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosipparser2.a; path = "../liblinphone-sdk/apple-darwin/lib/libosipparser2.a"; sourceTree = SOURCE_ROOT; }; - 220FAD2F10765B400068D98F /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = SOURCE_ROOT; }; - 220FAD3010765B400068D98F /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = SOURCE_ROOT; }; + 220FAD2810765B400068D98F /* libeXosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeXosip2.a; path = "liblinphone-sdk/apple-darwin/lib/libeXosip2.a"; sourceTree = ""; }; + 220FAD2910765B400068D98F /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = ""; }; + 220FAD2A10765B400068D98F /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = ""; }; + 220FAD2B10765B400068D98F /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer.a"; sourceTree = ""; }; + 220FAD2C10765B400068D98F /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = ""; }; + 220FAD2D10765B400068D98F /* libosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosip2.a; path = "liblinphone-sdk/apple-darwin/lib/libosip2.a"; sourceTree = ""; }; + 220FAD2E10765B400068D98F /* libosipparser2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosipparser2.a; path = "liblinphone-sdk/apple-darwin/lib/libosipparser2.a"; sourceTree = ""; }; + 220FAD2F10765B400068D98F /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = ""; }; + 220FAD3010765B400068D98F /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = ""; }; 220FAE4A10767A6A0068D98F /* PhoneMainView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PhoneMainView.xib; sourceTree = ""; }; - 22226C11118197C0000CA27B /* startcall-green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "startcall-green.png"; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/startcall-green.png"; sourceTree = SOURCE_ROOT; }; - 22226C13118197EC000CA27B /* stopcall-red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "stopcall-red.png"; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/stopcall-red.png"; sourceTree = SOURCE_ROOT; }; - 22226C161181986A000CA27B /* contact-orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "contact-orange.png"; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/contact-orange.png"; sourceTree = SOURCE_ROOT; }; - 22226C171181986A000CA27B /* dialer-orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialer-orange.png"; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/dialer-orange.png"; sourceTree = SOURCE_ROOT; }; - 22226C1C11819B34000CA27B /* history-orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "history-orange.png"; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/history-orange.png"; sourceTree = SOURCE_ROOT; }; - 223148E31178A08200637D6A /* libilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbc.a; path = "../liblinphone-sdk/apple-darwin/lib/libilbc.a"; sourceTree = SOURCE_ROOT; }; - 223148E51178A09900637D6A /* libmsilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsilbc.a; path = "../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsilbc.a"; sourceTree = SOURCE_ROOT; }; - 2237D4081084D7A9001383EE /* oldphone-mono.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = "oldphone-mono.wav"; path = "../liblinphone-sdk/apple-darwin/share/sounds/linphone/rings/oldphone-mono.wav"; sourceTree = ""; }; + 22226C11118197C0000CA27B /* startcall-green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "startcall-green.png"; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/startcall-green.png"; sourceTree = ""; }; + 22226C13118197EC000CA27B /* stopcall-red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "stopcall-red.png"; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/stopcall-red.png"; sourceTree = ""; }; + 22226C161181986A000CA27B /* contact-orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "contact-orange.png"; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/contact-orange.png"; sourceTree = ""; }; + 22226C171181986A000CA27B /* dialer-orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialer-orange.png"; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/dialer-orange.png"; sourceTree = ""; }; + 22226C1C11819B34000CA27B /* history-orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "history-orange.png"; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/history-orange.png"; sourceTree = ""; }; + 223148E31178A08200637D6A /* libilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbc.a; path = "liblinphone-sdk/apple-darwin/lib/libilbc.a"; sourceTree = ""; }; + 223148E51178A09900637D6A /* libmsilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsilbc.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsilbc.a"; sourceTree = ""; }; + 2237D4081084D7A9001383EE /* oldphone-mono.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = "oldphone-mono.wav"; path = "liblinphone-sdk/apple-darwin/share/sounds/linphone/rings/oldphone-mono.wav"; sourceTree = ""; }; 2242D91410D66BF300E9963F /* in_call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = in_call.png; path = Resources/in_call.png; sourceTree = ""; }; 2242D91510D66BF300E9963F /* out_call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = out_call.png; path = Resources/out_call.png; sourceTree = ""; }; - 2242D91810D66C2100E9963F /* mic_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_active.png; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/mic_active.png"; sourceTree = SOURCE_ROOT; }; - 2242D91910D66C2100E9963F /* mic_muted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_muted.png; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/mic_muted.png"; sourceTree = SOURCE_ROOT; }; + 2242D91810D66C2100E9963F /* mic_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_active.png; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/mic_active.png"; sourceTree = ""; }; + 2242D91910D66C2100E9963F /* mic_muted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_muted.png; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/mic_muted.png"; sourceTree = ""; }; 2242D9C710D691F900E9963F /* GenericTabViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenericTabViewController.h; sourceTree = ""; }; 2242D9C810D691F900E9963F /* GenericTabViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenericTabViewController.m; sourceTree = ""; }; 2245671C107699F700F10948 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = ""; }; @@ -209,9 +208,8 @@ 225CB2E811ABB51000628906 /* clavier-01-106px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-106px.png"; path = "Resources/clavier-01-106px.png"; sourceTree = ""; }; 225CB2E911ABB51000628906 /* clavier-01-108px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-108px.png"; path = "Resources/clavier-01-108px.png"; sourceTree = ""; }; 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-160px.png"; path = "Resources/clavier-01-160px.png"; sourceTree = ""; }; - 225CB2F911ABB76400628906 /* linphone-banner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-banner.png"; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/linphone-banner.png"; sourceTree = SOURCE_ROOT; }; + 225CB2F911ABB76400628906 /* linphone-banner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-banner.png"; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/linphone-banner.png"; sourceTree = ""; }; 2264B6D111200342002C2C53 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; - 2273785D10A3703300526073 /* libmsiounit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsiounit.a; path = "../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsiounit.a"; sourceTree = SOURCE_ROOT; }; 22744019106F31BD006EC466 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 2274402E106F335E006EC466 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 22744043106F33FC006EC466 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; @@ -236,7 +234,7 @@ 22F2508B107141E100AC9B3F /* PhoneViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhoneViewController.h; sourceTree = ""; }; 22F2508C107141E100AC9B3F /* PhoneViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhoneViewController.m; sourceTree = ""; }; 22F2508D107141E100AC9B3F /* PhoneViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PhoneViewController.xib; sourceTree = ""; }; - 22F254801073D99800AC9B3F /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ringback.wav; path = "../liblinphone-sdk/apple-darwin/share/sounds/linphone/ringback.wav"; sourceTree = SOURCE_ROOT; }; + 22F254801073D99800AC9B3F /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ringback.wav; path = "liblinphone-sdk/apple-darwin/share/sounds/linphone/ringback.wav"; sourceTree = ""; }; 22F51EF5107FA66500F98953 /* untitled.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = untitled.plist; sourceTree = ""; }; 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -264,7 +262,6 @@ 220FAD3810765B400068D98F /* libspeex.a in Frameworks */, 220FAD3910765B400068D98F /* libspeexdsp.a in Frameworks */, 224567C2107B968500F10948 /* AVFoundation.framework in Frameworks */, - 2273785E10A3703300526073 /* libmsiounit.a in Frameworks */, 22B5EFA310CE50BD00777D97 /* AddressBookUI.framework in Frameworks */, 22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */, 2264B6D211200342002C2C53 /* SystemConfiguration.framework in Frameworks */, @@ -323,8 +320,8 @@ 220FACDF107654FC0068D98F /* speex */, ); name = include; - path = "../liblinphone-sdk/apple-darwin/include"; - sourceTree = SOURCE_ROOT; + path = "liblinphone-sdk/apple-darwin/include"; + sourceTree = ""; }; 220FAC78107654FC0068D98F /* eXosip2 */ = { isa = PBXGroup; @@ -502,7 +499,6 @@ children = ( 223148E51178A09900637D6A /* libmsilbc.a */, 223148E31178A08200637D6A /* libilbc.a */, - 2273785D10A3703300526073 /* libmsiounit.a */, 220FAD2810765B400068D98F /* libeXosip2.a */, 220FAD2910765B400068D98F /* libgsm.a */, 220FAD2A10765B400068D98F /* liblinphone.a */, @@ -683,12 +679,11 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - HEADER_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/include/**"; + HEADER_SEARCH_PATHS = "liblinphone-sdk/apple-darwin/include/**"; INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( - "../liblinphone-sdk/apple-darwin/lib/**", - "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"", - "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", ); PRODUCT_NAME = linphone; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; @@ -704,12 +699,11 @@ COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - HEADER_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/include/**"; + HEADER_SEARCH_PATHS = "liblinphone-sdk/apple-darwin/include/**"; INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( - "../liblinphone-sdk/apple-darwin/lib/**", - "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"", - "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", ); PRODUCT_NAME = linphone; SDKROOT = iphoneos4.0; @@ -725,11 +719,12 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = ""; LINK_WITH_STANDARD_LIBRARIES = YES; PREBINDING = NO; "PROVISIONING_PROFILE[sdk=iphoneos*]" = "09801E17-63DB-47FD-A203-166EDD1E55A1"; - SDKROOT = iphoneos3.2; + SDKROOT = iphoneos4.0; }; name = Distribution; }; @@ -744,12 +739,11 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; - HEADER_SEARCH_PATHS = "../liblinphone-sdk/apple-darwin/include/**"; + HEADER_SEARCH_PATHS = "liblinphone-sdk/apple-darwin/include/**"; INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( - "../liblinphone-sdk/apple-darwin/lib/**", - "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"", - "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", ); PRODUCT_NAME = linphone; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; @@ -767,10 +761,11 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = ""; LINK_WITH_STANDARD_LIBRARIES = YES; PREBINDING = NO; - SDKROOT = iphoneos3.2; + SDKROOT = iphoneos4.0; }; name = Debug; }; @@ -782,8 +777,9 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 4.0; PREBINDING = NO; - SDKROOT = iphoneos3.2; + SDKROOT = iphoneos4.0; }; name = Release; }; diff --git a/submodules/externals/exosip b/submodules/externals/exosip new file mode 160000 index 000000000..2d7c3bbba --- /dev/null +++ b/submodules/externals/exosip @@ -0,0 +1 @@ +Subproject commit 2d7c3bbba1a38eb307cc9a5e22ab68c2f1b5a2b1 diff --git a/submodules/externals/gsm b/submodules/externals/gsm new file mode 160000 index 000000000..405fb3856 --- /dev/null +++ b/submodules/externals/gsm @@ -0,0 +1 @@ +Subproject commit 405fb3856f0b9e902dcb159ec6a3409ba6e78476 diff --git a/submodules/externals/osip b/submodules/externals/osip new file mode 160000 index 000000000..5a3da085c --- /dev/null +++ b/submodules/externals/osip @@ -0,0 +1 @@ +Subproject commit 5a3da085ca1dcf82a852cee1e191cab0b98ff1f1 diff --git a/submodules/externals/speex b/submodules/externals/speex new file mode 160000 index 000000000..a6d05eb5f --- /dev/null +++ b/submodules/externals/speex @@ -0,0 +1 @@ +Subproject commit a6d05eb5ff9d5062852cdf7df574bec728921ef9 diff --git a/submodules/libilbc-rfc3951 b/submodules/libilbc-rfc3951 new file mode 160000 index 000000000..2f7640d57 --- /dev/null +++ b/submodules/libilbc-rfc3951 @@ -0,0 +1 @@ +Subproject commit 2f7640d571fa12f75d269eda59d91e2037f99c5d diff --git a/submodules/linphone b/submodules/linphone new file mode 160000 index 000000000..3e8f9536e --- /dev/null +++ b/submodules/linphone @@ -0,0 +1 @@ +Subproject commit 3e8f9536eeea2e607e7612928f9ca7658bd2ffc4