From 8a1c3000cdb618fb875515bfce1dfa65b400bd5b Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 18 Nov 2011 14:23:41 +0100 Subject: [PATCH] merge vios IOS with master --- .gitmodules | 2 +- Classes/LinphoneUI/LinphoneManager.h | 1 - Classes/LinphoneUI/LinphoneManager.m | 50 +- Classes/PhoneViewController.m | 4 +- README | 43 +- Settings.bundle/Root.plist | 2 +- linphone copy-Info.plist | 44 ++ linphone.xcodeproj/project.pbxproj | 540 +++++++++++++++--- submodules/build/Makefile | 32 +- submodules/build/builder-iphone-os.mk | 50 +- submodules/build/builders.d/mssilk.mk | 1 + submodules/build/builders.d/openssl.mk | 8 +- submodules/build/builders.d/zrtp.mk | 20 +- .../build/builders.d/zrtpcpp.CMakeLists.txt | 169 ------ submodules/build/iphone-config.site | 1 + submodules/build/iphone-toolchain.cmake.i386 | 13 - submodules/externals/zrtpcpp | 2 +- .../liblinphone.xcodeproj/project.pbxproj | 33 +- submodules/linphone | 2 +- 19 files changed, 643 insertions(+), 374 deletions(-) create mode 100644 linphone copy-Info.plist delete mode 100755 submodules/build/builders.d/zrtpcpp.CMakeLists.txt delete mode 100644 submodules/build/iphone-toolchain.cmake.i386 diff --git a/.gitmodules b/.gitmodules index 099648fff..c331201f9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -39,7 +39,7 @@ url = http://git.chromium.org/webm/libvpx.git [submodule "submodules/externals/zrtpcpp"] path = submodules/externals/zrtpcpp - url = git://github.com/wernerd/ZRTPCPP.git + url = git://git.linphone.org/zrtpcpp.git [submodule "submodules/mssilk"] path = submodules/mssilk url = git://git.linphone.org/mssilk.git diff --git a/Classes/LinphoneUI/LinphoneManager.h b/Classes/LinphoneUI/LinphoneManager.h index be7984827..e3bc4ab95 100644 --- a/Classes/LinphoneUI/LinphoneManager.h +++ b/Classes/LinphoneUI/LinphoneManager.h @@ -33,7 +33,6 @@ typedef enum _Connectivity { @private SCNetworkReachabilityContext proxyReachabilityContext; SCNetworkReachabilityRef proxyReachability; - CFReadStreamRef mReadStream; NSTimer* mIterateTimer; id mLogView; bool isbackgroundModeEnabled; diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index 941b2d8bc..fe1609750 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -547,7 +547,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach } [self configurePayloadType:"MP4V-ES" fromPrefKey:@"mp4v-es_preference" withRate:90000]; [self configurePayloadType:"H264" fromPrefKey:@"h264_preference" withRate:90000]; - [self configurePayloadType:"VP8-DRAFT-0-3-2" fromPrefKey:@"vp8_preference" withRate:90000]; + [self configurePayloadType:"VP8" fromPrefKey:@"vp8_preference" withRate:90000]; bool enableVideo = [[NSUserDefaults standardUserDefaults] boolForKey:@"enable_video_preference"]; linphone_core_enable_video(theLinphoneCore, enableVideo, enableVideo); @@ -564,7 +564,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach } else { isbackgroundModeEnabled=false; } - + } - (BOOL)isNotIphone3G { @@ -645,42 +645,11 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach ms_error("cannot get current transport"); } - if (mReadStream == nil && transportValue.udp_port>0) { //only for udp - int sipsock = linphone_core_get_sip_socket(theLinphoneCore); - //disable keepalive handler - linphone_core_enable_keep_alive(theLinphoneCore, false); - const char *port; - addr=linphone_address_new(linphone_proxy_config_get_addr(proxyCfg)); - memset(&hints,0,sizeof(hints)); - hints.ai_family=linphone_core_ipv6_enabled(theLinphoneCore) ? AF_INET6 : AF_INET; - port=linphone_address_get_port(addr); - if (port==NULL) port="5060"; - err=getaddrinfo(linphone_address_get_domain(addr),port,&hints,&res); - if (err!=0){ - ms_error("getaddrinfo() failed for %s: %s",linphone_address_get_domain(addr),gai_strerror(err)); - linphone_address_destroy(addr); - return; - } - err=connect(sipsock,res->ai_addr,res->ai_addrlen); - if (err==-1){ - ms_error("Connect failed: %s",strerror(errno)); - } - freeaddrinfo(res); - - CFStreamCreatePairWithSocket(NULL, (CFSocketNativeHandle)sipsock, &mReadStream,nil); - - if (!CFReadStreamSetProperty(mReadStream, kCFStreamNetworkServiceType, kCFStreamNetworkServiceTypeVoIP)) { - ms_error("cannot set service type to voip for read stream"); - } - - - if (!CFReadStreamOpen(mReadStream)) { - ms_error("cannot open read stream"); - } - } } else { ms_warning("Entering lite bg mode"); + AVAudioSession *audioSession = [AVAudioSession sharedInstance]; + [audioSession setDelegate:nil]; [self destroyLibLinphone]; } @@ -821,17 +790,6 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach //enable sip keepalive linphone_core_enable_keep_alive(theLinphoneCore, true); } - if (mReadStream !=nil) { - //unconnect - int socket = linphone_core_get_sip_socket(theLinphoneCore); - struct sockaddr hints; - memset(&hints,0,sizeof(hints)); - hints.sa_family=AF_UNSPEC; - connect(socket,&hints,sizeof(hints)); - CFReadStreamClose(mReadStream); - CFRelease(mReadStream); - mReadStream=nil; - } } -(void) registerLogView:(id) view { mLogView = view; diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m index c55ab2b9e..3edfb93af 100644 --- a/Classes/PhoneViewController.m +++ b/Classes/PhoneViewController.m @@ -265,9 +265,9 @@ -(void) displayIncomingCallNotigicationFromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName { - + if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] - && [UIApplication sharedApplication].applicationState == UIApplicationStateBackground) { + && [UIApplication sharedApplication].applicationState != UIApplicationStateActive) { // Create a new notification UILocalNotification* notif = [[[UILocalNotification alloc] init] autorelease]; if (notif) diff --git a/README b/README index dcbce0eab..8e33ced92 100644 --- a/README +++ b/README @@ -22,28 +22,35 @@ $ sudo mv gas-preprocessor.pl /opt/local/bin/. Link macport libtoolize to glibtoolize (sudo ln -s /opt/local/bin/glibtoolize /opt/local/bin/libtoolize) Link host's strings to simulator SDK (ln -s /usr/bin/strings /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/strings) -You may update variable SDK_VERSION from file submodules/build/iphone-config.site according to your iPhone SDK version. Current is 4.0 - -To generate the liblinphone dual arch sdk, once the above commands have been executed: +******************************************* +*******GPL versus non GPL****************** +******************************************* +This sdk can be generated in 2 flavors. Firt is GPL, it means liblinphone include GPL third parties like FFMPEG or x264. +If you choose this flavor, your final application must comply with GPL. This is the default mode. + +To generate the liblinphone multi arch sdkin GPL mode, once the above commands have been executed: cd submodules/build make all -In case you upgrade your IOS SDK, you may force configure by using make targets and +ALTERNATIVELY, you can force liblinphone to use only non GPL code except for liblinphone, mediastremer2, ortp, exosip, osip. +If you choose this flavor, your final application is still subject to GPL except if you have an alternative license for liblinphone, mediastremer2, ortp, exosip, osip. + +To generate the liblinphone multi arch sdkin non GPL mode, once the above commands have been executed: + cd submodules/build + make all enable_gpl=no + +****************************************** +****Third party, subject to lincense*i**** +****************************************** +The liblinphone-sdk is compiled with third parties code that are subject to license, specially: AMR, SILK and X264. +Linphone activates/de-activates these codecs thanks to the preprocessor macros HAVE_SILK, HAVE_AMR, HAVE_X264 positioned in xcode. +Before embeding these 3 codecs in the final application, make sure to have the right to do so. +****************************************** + + +In case you upgrade your IOS SDK, you may force configure by using make targets Libraries are available from liblinphone-sdk/ -AMR plugin -liblinphone-sdk contains Linphone ARM plugin. As AMR may require to pay for patents, it is not enabled unless Linphone for iphone is compiled with gcc flag HAVE_AMR. +liblinphone xcode subproject: This subproject is just for debuggingi purpose, do not compile it until you know exactly what you are doing. -SILK plugin -liblinphone-sdk contains Linphone SILK plugin. -As Skype requires that you accept its license, the plugin is not compiled and enabled unless: -- you compile the SDK with enable_silk=yes flag (make); -- you compile the UI with HAVE_SILK preprocessor macro (xcode). -- you compile add libmssilk.so to the list a library (xcode). - -ZRTP -liblinphone-sdk depends on the GNU LIBZRTPCPP extension for ZRTP support. -As the license of this library is GPLv3+ it is not enabled unless the enable_zrtp=yes option is passed to the make command. -Add liblinphone-sdk/lib/libzrtpcpp.a to XCode. Define sip property media_encryption to "zrtp" in linphonerc. -Note that activiting ZRTP makes the license of the whole application GPLv3+. diff --git a/Settings.bundle/Root.plist b/Settings.bundle/Root.plist index eae40ec55..5bc0378b6 100644 --- a/Settings.bundle/Root.plist +++ b/Settings.bundle/Root.plist @@ -192,7 +192,7 @@ DefaultValue - + Key backgroundmode_preference Title diff --git a/linphone copy-Info.plist b/linphone copy-Info.plist new file mode 100644 index 000000000..dccfa7f39 --- /dev/null +++ b/linphone copy-Info.plist @@ -0,0 +1,44 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleDisplayName + Linphone + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + icone-linphone-57.png + CFBundleIdentifier + org.linphone.phone + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + 3.4.9 + CFBundleSignature + ???? + CFBundleVersion + 1.0.7.3 + NSMainNibFile + PhoneMainView + UIApplicationExitsOnSuspend + + UIBackgroundModes + + voip + audio + + UIRequiredDeviceCapabilities + + wifi + microphone + + UIRequiresPersistentWiFi + + + diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index f28107691..93147ee6e 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -19,6 +19,9 @@ 220FAD3810765B400068D98F /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2F10765B400068D98F /* libspeex.a */; }; 220FAD3910765B400068D98F /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD3010765B400068D98F /* libspeexdsp.a */; }; 220FAE4B10767A6A0068D98F /* PhoneMainView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 220FAE4A10767A6A0068D98F /* PhoneMainView.xib */; }; + 2211DB90147555C800DEE054 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB8F147555C800DEE054 /* libmediastreamer.a */; }; + 2211DB921475562600DEE054 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB911475562600DEE054 /* liblinphone.a */; }; + 2211DB95147564B400DEE054 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2211DB94147564B400DEE054 /* Settings.bundle */; }; 2214783D1386A2030020F8B8 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2214783B1386A2030020F8B8 /* Localizable.strings */; }; 2214EB7A12F846B1002A5394 /* UICallButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB7912F846B1002A5394 /* UICallButton.m */; }; 2214EB8912F84EBB002A5394 /* UIHangUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB8812F84EBB002A5394 /* UIHangUpButton.m */; }; @@ -83,6 +86,101 @@ 22BB1A69132FF16A005CD7AA /* UIEraseButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22BB1A68132FF16A005CD7AA /* UIEraseButton.m */; }; 22C755601317E59C007BC101 /* UIBluetoothButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22C7555F1317E59C007BC101 /* UIBluetoothButton.m */; }; 22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B68012A3E0BE001AE361 /* libresolv.dylib */; }; + 22D8F11F147548E2008C97DB /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 2274550710700509006EC466 /* linphonerc */; }; + 22D8F120147548E2008C97DB /* PhoneViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22F2508D107141E100AC9B3F /* PhoneViewController.xib */; }; + 22D8F121147548E2008C97DB /* ringback.wav in Resources */ = {isa = PBXBuildFile; fileRef = 22F254801073D99800AC9B3F /* ringback.wav */; }; + 22D8F122147548E2008C97DB /* PhoneMainView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 220FAE4A10767A6A0068D98F /* PhoneMainView.xib */; }; + 22D8F124147548E2008C97DB /* untitled.plist in Resources */ = {isa = PBXBuildFile; fileRef = 22F51EF5107FA66500F98953 /* untitled.plist */; }; + 22D8F125147548E2008C97DB /* oldphone-mono.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2237D4081084D7A9001383EE /* oldphone-mono.wav */; }; + 22D8F126147548E2008C97DB /* CallHistoryTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 227BCDC110D4004600FBFD76 /* CallHistoryTableViewController.xib */; }; + 22D8F127147548E2008C97DB /* in_call.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91410D66BF300E9963F /* in_call.png */; }; + 22D8F128147548E2008C97DB /* out_call.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91510D66BF300E9963F /* out_call.png */; }; + 22D8F129147548E2008C97DB /* mic_active.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91810D66C2100E9963F /* mic_active.png */; }; + 22D8F12A147548E2008C97DB /* mic_muted.png in Resources */ = {isa = PBXBuildFile; fileRef = 2242D91910D66C2100E9963F /* mic_muted.png */; }; + 22D8F12B147548E2008C97DB /* Speaker-32-on.png in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A783111C1BA800B04932 /* Speaker-32-on.png */; }; + 22D8F12C147548E2008C97DB /* Speaker-32-off.png in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A784111C1BA800B04932 /* Speaker-32-off.png */; }; + 22D8F12D147548E2008C97DB /* ConsoleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */; }; + 22D8F12E147548E2008C97DB /* icone-linphone-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 22058C70116E305000B08DDD /* icone-linphone-57.png */; }; + 22D8F12F147548E2008C97DB /* startcall-green.png in Resources */ = {isa = PBXBuildFile; fileRef = 22226C11118197C0000CA27B /* startcall-green.png */; }; + 22D8F130147548E2008C97DB /* stopcall-red.png in Resources */ = {isa = PBXBuildFile; fileRef = 22226C13118197EC000CA27B /* stopcall-red.png */; }; + 22D8F131147548E2008C97DB /* contact-orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 22226C161181986A000CA27B /* contact-orange.png */; }; + 22D8F132147548E2008C97DB /* dialer-orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 22226C171181986A000CA27B /* dialer-orange.png */; }; + 22D8F133147548E2008C97DB /* history-orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 22226C1C11819B34000CA27B /* history-orange.png */; }; + 22D8F134147548E2008C97DB /* clavier-01-106px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E811ABB51000628906 /* clavier-01-106px.png */; }; + 22D8F135147548E2008C97DB /* clavier-01-108px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E911ABB51000628906 /* clavier-01-108px.png */; }; + 22D8F136147548E2008C97DB /* clavier-01-160px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */; }; + 22D8F137147548E2008C97DB /* linphone-banner.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2F911ABB76400628906 /* linphone-banner.png */; }; + 22D8F138147548E2008C97DB /* MoreViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* MoreViewController.xib */; }; + 22D8F139147548E2008C97DB /* oldphone-mono-30s.caf in Resources */ = {isa = PBXBuildFile; fileRef = 2242E312125235120061DDCE /* oldphone-mono-30s.caf */; }; + 22D8F13A147548E2008C97DB /* IncallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 222A483112F7176F0075F07F /* IncallViewController.xib */; }; + 22D8F13B147548E2008C97DB /* FirstLoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2218A92412FBE1340088A667 /* FirstLoginViewController.xib */; }; + 22D8F13C147548E2008C97DB /* iTunesArtwork in Resources */ = {isa = PBXBuildFile; fileRef = 228B19AE130290C500F154D3 /* iTunesArtwork */; }; + 22D8F13D147548E2008C97DB /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2214783B1386A2030020F8B8 /* Localizable.strings */; }; + 22D8F13E147548E2008C97DB /* missed_call.png in Resources */ = {isa = PBXBuildFile; fileRef = 22E19E47138A67A000FBFE87 /* missed_call.png */; }; + 22D8F13F147548E2008C97DB /* VideoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E028B613B4CCBD0068A713 /* VideoViewController.xib */; }; + 22D8F140147548E2008C97DB /* audio.plist in Resources */ = {isa = PBXBuildFile; fileRef = 226B563E13CAF1CD00921595 /* audio.plist */; }; + 22D8F141147548E2008C97DB /* video.plist in Resources */ = {isa = PBXBuildFile; fileRef = 22E1A9E713CAF4AA00219531 /* video.plist */; }; + 22D8F142147548E2008C97DB /* rootca.pem in Resources */ = {isa = PBXBuildFile; fileRef = 70571E1913FABCB000CDD3C2 /* rootca.pem */; }; + 22D8F144147548E2008C97DB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; + 22D8F145147548E2008C97DB /* LinphoneAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */; }; + 22D8F146147548E2008C97DB /* PhoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F2508C107141E100AC9B3F /* PhoneViewController.m */; }; + 22D8F147147548E2008C97DB /* ContactPickerDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 22B5EFE410CE5E5800777D97 /* ContactPickerDelegate.m */; }; + 22D8F148147548E2008C97DB /* CallHistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 227BCDC010D4004600FBFD76 /* CallHistoryTableViewController.m */; }; + 22D8F149147548E2008C97DB /* GenericTabViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2242D9C810D691F900E9963F /* GenericTabViewController.m */; }; + 22D8F14A147548E2008C97DB /* MoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81C111C44E100B04932 /* MoreViewController.m */; }; + 22D8F14B147548E2008C97DB /* ConsoleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81F111C44E100B04932 /* ConsoleViewController.m */; }; + 22D8F14C147548E2008C97DB /* UIDigitButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */; }; + 22D8F14D147548E2008C97DB /* LinphoneManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E99E12F801C200220D9C /* LinphoneManager.m */; }; + 22D8F14E147548E2008C97DB /* UICallButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB7912F846B1002A5394 /* UICallButton.m */; }; + 22D8F14F147548E2008C97DB /* UIHangUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB8812F84EBB002A5394 /* UIHangUpButton.m */; }; + 22D8F150147548E2008C97DB /* UIToggleButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EBD912F8558F002A5394 /* UIToggleButton.m */; }; + 22D8F151147548E2008C97DB /* UIMuteButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EBF212F86360002A5394 /* UIMuteButton.m */; }; + 22D8F152147548E2008C97DB /* UISpeakerButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22968A5E12F875C600588287 /* UISpeakerButton.m */; }; + 22D8F153147548E2008C97DB /* UIDuration.m in Sources */ = {isa = PBXBuildFile; fileRef = 22968A8712F87C2000588287 /* UIDuration.m */; }; + 22D8F154147548E2008C97DB /* FirstLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2218A92312FBE1340088A667 /* FirstLoginViewController.m */; }; + 22D8F155147548E2008C97DB /* UIBluetoothButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22C7555F1317E59C007BC101 /* UIBluetoothButton.m */; }; + 22D8F156147548E2008C97DB /* UIEraseButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22BB1A68132FF16A005CD7AA /* UIEraseButton.m */; }; + 22D8F157147548E2008C97DB /* FastAddressBook.m in Sources */ = {isa = PBXBuildFile; fileRef = 223963161393CFAF001DE689 /* FastAddressBook.m */; }; + 22D8F158147548E2008C97DB /* VideoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E028B513B4CCBD0068A713 /* VideoViewController.m */; }; + 22D8F159147548E2008C97DB /* UICamSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AA8B0013D83F6300B30535 /* UICamSwitch.m */; }; + 22D8F15B147548E2008C97DB /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0B13E830E400EFC6DC /* libvpx.a */; }; + 22D8F15C147548E2008C97DB /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F413E147EB002BA2C0 /* QuartzCore.framework */; }; + 22D8F15D147548E2008C97DB /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F213E147E3002BA2C0 /* OpenGLES.framework */; }; + 22D8F15E147548E2008C97DB /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8813C73DC000210156 /* CoreMedia.framework */; }; + 22D8F15F147548E2008C97DB /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8613C73D8A00210156 /* CoreVideo.framework */; }; + 22D8F160147548E2008C97DB /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8013C73D3100210156 /* libavcodec.a */; }; + 22D8F161147548E2008C97DB /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8113C73D3100210156 /* libavutil.a */; }; + 22D8F162147548E2008C97DB /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8213C73D3100210156 /* libswscale.a */; }; + 22D8F163147548E2008C97DB /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AD133B5EA20044EA25 /* libssl.a */; }; + 22D8F164147548E2008C97DB /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AE133B5EA20044EA25 /* libcrypto.a */; }; + 22D8F165147548E2008C97DB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; + 22D8F166147548E2008C97DB /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + 22D8F167147548E2008C97DB /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; + 22D8F168147548E2008C97DB /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22744019106F31BD006EC466 /* CoreAudio.framework */; }; + 22D8F169147548E2008C97DB /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2274402E106F335E006EC466 /* AudioToolbox.framework */; }; + 22D8F16A147548E2008C97DB /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2810765B400068D98F /* libeXosip2.a */; }; + 22D8F16B147548E2008C97DB /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2910765B400068D98F /* libgsm.a */; }; + 22D8F16C147548E2008C97DB /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2D10765B400068D98F /* libosip2.a */; }; + 22D8F16D147548E2008C97DB /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2E10765B400068D98F /* libosipparser2.a */; }; + 22D8F16E147548E2008C97DB /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2F10765B400068D98F /* libspeex.a */; }; + 22D8F16F147548E2008C97DB /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD3010765B400068D98F /* libspeexdsp.a */; }; + 22D8F170147548E2008C97DB /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 224567C1107B968500F10948 /* AVFoundation.framework */; }; + 22D8F171147548E2008C97DB /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B5EFA210CE50BD00777D97 /* AddressBookUI.framework */; }; + 22D8F172147548E2008C97DB /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B5F03410CE6B2F00777D97 /* AddressBook.framework */; }; + 22D8F173147548E2008C97DB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2264B6D111200342002C2C53 /* SystemConfiguration.framework */; }; + 22D8F174147548E2008C97DB /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223148E31178A08200637D6A /* libilbc.a */; }; + 22D8F175147548E2008C97DB /* libmsilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223148E51178A09900637D6A /* libmsilbc.a */; }; + 22D8F176147548E2008C97DB /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 228697C311AC29B800E9E0CA /* CFNetwork.framework */; }; + 22D8F177147548E2008C97DB /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2C10765B400068D98F /* libortp.a */; }; + 22D8F178147548E2008C97DB /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B68012A3E0BE001AE361 /* libresolv.dylib */; }; + 22D8F179147548E2008C97DB /* libopencore-amrwb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED31344B0EF00F6EF27 /* libopencore-amrwb.a */; }; + 22D8F17A147548E2008C97DB /* libopencore-amrnb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED41344B0EF00F6EF27 /* libopencore-amrnb.a */; }; + 22D8F17B147548E2008C97DB /* libmsamr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED51344B0EF00F6EF27 /* libmsamr.a */; }; + 22D8F17C147548E2008C97DB /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AA8AFB13D7125500B30535 /* libx264.a */; }; + 22D8F17D147548E2008C97DB /* libmsx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AA8AFC13D7125500B30535 /* libmsx264.a */; }; + 22D8F17E147548E2008C97DB /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */; }; + 22D8F17F147548E2008C97DB /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AB1472527D0037138E /* libsrtp.a */; }; + 22D8F180147548E2008C97DB /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AF147259670037138E /* libmssilk.a */; }; 22E028B713B4CCBD0068A713 /* VideoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E028B513B4CCBD0068A713 /* VideoViewController.m */; }; 22E028B813B4CCBD0068A713 /* VideoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E028B613B4CCBD0068A713 /* VideoViewController.xib */; }; 22E0A785111C1BA800B04932 /* Speaker-32-on.png in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A783111C1BA800B04932 /* Speaker-32-on.png */; }; @@ -105,23 +203,6 @@ 70E542F513E147EB002BA2C0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F413E147EB002BA2C0 /* QuartzCore.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - F4D9F24C145748E80035B0D0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F4D9F243145748E80035B0D0 /* liblinphone.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D2AAC07E0554694100DB518D; - remoteInfo = liblinphone; - }; - F4D9F24E145748E80035B0D0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F4D9F243145748E80035B0D0 /* liblinphone.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 22DD19BE13A8D7FA0018ECD4; - remoteInfo = mediastream; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ 2247673A129C3B9C002B94B4 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -132,6 +213,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 22D8F181147548E2008C97DB /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 11; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -256,6 +346,9 @@ 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 = ""; }; + 2211DB8F147555C800DEE054 /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer.a"; sourceTree = ""; }; + 2211DB911475562600DEE054 /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = ""; }; + 2211DB94147564B400DEE054 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = nogpl/Settings.bundle; sourceTree = ""; }; 2214783C1386A2030020F8B8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/Localizable.strings; sourceTree = ""; }; 2214EB7812F846B1002A5394 /* UICallButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICallButton.h; sourceTree = ""; }; 2214EB7912F846B1002A5394 /* UICallButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICallButton.m; sourceTree = ""; }; @@ -413,6 +506,8 @@ 22C7564A13265C6A007BC101 /* x509_vfy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509_vfy.h; sourceTree = ""; }; 22C7564B13265C6A007BC101 /* x509v3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509v3.h; sourceTree = ""; }; 22D1B68012A3E0BE001AE361 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = usr/lib/libresolv.dylib; sourceTree = SDKROOT; }; + 22D8F187147548E2008C97DB /* linphone-nogpl.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "linphone-nogpl.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 22D8F189147548E3008C97DB /* linphone copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "linphone copy-Info.plist"; path = "/Users/jehanmonnier/workspaces/workspace-iphone-port/linphone-iphone/linphone copy-Info.plist"; sourceTree = ""; }; 22E028B413B4CCBD0068A713 /* VideoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoViewController.h; sourceTree = ""; }; 22E028B513B4CCBD0068A713 /* VideoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoViewController.m; sourceTree = ""; }; 22E028B613B4CCBD0068A713 /* VideoViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = VideoViewController.xib; sourceTree = ""; }; @@ -432,7 +527,6 @@ 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 = ""; }; - 22F3D57D13CCC89600A0DA02 /* liblinphone.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = liblinphone.a; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; @@ -442,7 +536,6 @@ 70E542F213E147E3002BA2C0 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 70E542F413E147EB002BA2C0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 8D1107310486CEB800E47090 /* linphone-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "linphone-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = ""; }; - F4D9F243145748E80035B0D0 /* liblinphone.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = liblinphone.xcodeproj; path = submodules/liblinphone.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -450,6 +543,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 2211DB921475562600DEE054 /* liblinphone.a in Frameworks */, + 2211DB90147555C800DEE054 /* libmediastreamer.a in Frameworks */, 7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */, 70E542F513E147EB002BA2C0 /* QuartzCore.framework in Frameworks */, 70E542F313E147E3002BA2C0 /* OpenGLES.framework in Frameworks */, @@ -491,6 +586,51 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 22D8F15A147548E2008C97DB /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 22D8F15B147548E2008C97DB /* libvpx.a in Frameworks */, + 22D8F15C147548E2008C97DB /* QuartzCore.framework in Frameworks */, + 22D8F15D147548E2008C97DB /* OpenGLES.framework in Frameworks */, + 22D8F15E147548E2008C97DB /* CoreMedia.framework in Frameworks */, + 22D8F15F147548E2008C97DB /* CoreVideo.framework in Frameworks */, + 22D8F160147548E2008C97DB /* libavcodec.a in Frameworks */, + 22D8F161147548E2008C97DB /* libavutil.a in Frameworks */, + 22D8F162147548E2008C97DB /* libswscale.a in Frameworks */, + 22D8F163147548E2008C97DB /* libssl.a in Frameworks */, + 22D8F164147548E2008C97DB /* libcrypto.a in Frameworks */, + 22D8F165147548E2008C97DB /* Foundation.framework in Frameworks */, + 22D8F166147548E2008C97DB /* UIKit.framework in Frameworks */, + 22D8F167147548E2008C97DB /* CoreGraphics.framework in Frameworks */, + 22D8F168147548E2008C97DB /* CoreAudio.framework in Frameworks */, + 22D8F169147548E2008C97DB /* AudioToolbox.framework in Frameworks */, + 22D8F16A147548E2008C97DB /* libeXosip2.a in Frameworks */, + 22D8F16B147548E2008C97DB /* libgsm.a in Frameworks */, + 22D8F16C147548E2008C97DB /* libosip2.a in Frameworks */, + 22D8F16D147548E2008C97DB /* libosipparser2.a in Frameworks */, + 22D8F16E147548E2008C97DB /* libspeex.a in Frameworks */, + 22D8F16F147548E2008C97DB /* libspeexdsp.a in Frameworks */, + 22D8F170147548E2008C97DB /* AVFoundation.framework in Frameworks */, + 22D8F171147548E2008C97DB /* AddressBookUI.framework in Frameworks */, + 22D8F172147548E2008C97DB /* AddressBook.framework in Frameworks */, + 22D8F173147548E2008C97DB /* SystemConfiguration.framework in Frameworks */, + 22D8F174147548E2008C97DB /* libilbc.a in Frameworks */, + 22D8F175147548E2008C97DB /* libmsilbc.a in Frameworks */, + 22D8F176147548E2008C97DB /* CFNetwork.framework in Frameworks */, + 22D8F177147548E2008C97DB /* libortp.a in Frameworks */, + 22D8F178147548E2008C97DB /* libresolv.dylib in Frameworks */, + 22D8F179147548E2008C97DB /* libopencore-amrwb.a in Frameworks */, + 22D8F17A147548E2008C97DB /* libopencore-amrnb.a in Frameworks */, + 22D8F17B147548E2008C97DB /* libmsamr.a in Frameworks */, + 22D8F17C147548E2008C97DB /* libx264.a in Frameworks */, + 22D8F17D147548E2008C97DB /* libmsx264.a in Frameworks */, + 22D8F17E147548E2008C97DB /* libSKP_SILK_SDK.a in Frameworks */, + 22D8F17F147548E2008C97DB /* libsrtp.a in Frameworks */, + 22D8F180147548E2008C97DB /* libmssilk.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -533,6 +673,7 @@ isa = PBXGroup; children = ( 1D6058910D05DD3D006BFB54 /* linphone.app */, + 22D8F187147548E2008C97DB /* linphone-nogpl.app */, ); name = Products; sourceTree = ""; @@ -725,6 +866,14 @@ path = speex; sourceTree = ""; }; + 2211DB9614764F6B00DEE054 /* nogpl */ = { + isa = PBXGroup; + children = ( + 2211DB94147564B400DEE054 /* Settings.bundle */, + ); + name = nogpl; + sourceTree = ""; + }; 2214EB7012F84668002A5394 /* LinphoneUI */ = { isa = PBXGroup; children = ( @@ -840,16 +989,17 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 2211DB9614764F6B00DEE054 /* nogpl */, + 2211DB911475562600DEE054 /* liblinphone.a */, + 2211DB8F147555C800DEE054 /* libmediastreamer.a */, 226183AF147259670037138E /* libmssilk.a */, 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */, 226183AB1472527D0037138E /* libsrtp.a */, - F4D9F243145748E80035B0D0 /* liblinphone.xcodeproj */, 7066FC0B13E830E400EFC6DC /* libvpx.a */, 70E542F413E147EB002BA2C0 /* QuartzCore.framework */, 70E542F213E147E3002BA2C0 /* OpenGLES.framework */, 22AA8AFB13D7125500B30535 /* libx264.a */, 22AA8AFC13D7125500B30535 /* libmsx264.a */, - 22F3D57D13CCC89600A0DA02 /* liblinphone.a */, 22E1A9E713CAF4AA00219531 /* video.plist */, 226B563E13CAF1CD00921595 /* audio.plist */, 22276E8813C73DC000210156 /* CoreMedia.framework */, @@ -891,6 +1041,7 @@ 22D1B68012A3E0BE001AE361 /* libresolv.dylib */, 22E5B0AD133B5EA20044EA25 /* libssl.a */, 22E5B0AE133B5EA20044EA25 /* libcrypto.a */, + 22D8F189147548E3008C97DB /* linphone copy-Info.plist */, ); name = CustomTemplate; sourceTree = ""; @@ -946,15 +1097,6 @@ name = Frameworks; sourceTree = ""; }; - F4D9F244145748E80035B0D0 /* Products */ = { - isa = PBXGroup; - children = ( - F4D9F24D145748E80035B0D0 /* liblinphone.a */, - F4D9F24F145748E80035B0D0 /* mediastream.app */, - ); - name = Products; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -976,6 +1118,24 @@ productReference = 1D6058910D05DD3D006BFB54 /* linphone.app */; productType = "com.apple.product-type.application"; }; + 22D8F11D147548E2008C97DB /* linphone-nogpl */ = { + isa = PBXNativeTarget; + buildConfigurationList = 22D8F182147548E2008C97DB /* Build configuration list for PBXNativeTarget "linphone-nogpl" */; + buildPhases = ( + 22D8F11E147548E2008C97DB /* Resources */, + 22D8F143147548E2008C97DB /* Sources */, + 22D8F15A147548E2008C97DB /* Frameworks */, + 22D8F181147548E2008C97DB /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "linphone-nogpl"; + productName = linphone; + productReference = 22D8F187147548E2008C97DB /* linphone-nogpl.app */; + productType = "com.apple.product-type.application"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -994,36 +1154,14 @@ ); mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = F4D9F244145748E80035B0D0 /* Products */; - ProjectRef = F4D9F243145748E80035B0D0 /* liblinphone.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 1D6058900D05DD3D006BFB54 /* linphone */, + 22D8F11D147548E2008C97DB /* linphone-nogpl */, ); }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - F4D9F24D145748E80035B0D0 /* liblinphone.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = liblinphone.a; - remoteRef = F4D9F24C145748E80035B0D0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - F4D9F24F145748E80035B0D0 /* mediastream.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = mediastream.app; - remoteRef = F4D9F24E145748E80035B0D0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 1D60588D0D05DD3D006BFB54 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -1068,6 +1206,49 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 22D8F11E147548E2008C97DB /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 22D8F11F147548E2008C97DB /* linphonerc in Resources */, + 22D8F120147548E2008C97DB /* PhoneViewController.xib in Resources */, + 22D8F121147548E2008C97DB /* ringback.wav in Resources */, + 22D8F122147548E2008C97DB /* PhoneMainView.xib in Resources */, + 22D8F124147548E2008C97DB /* untitled.plist in Resources */, + 22D8F125147548E2008C97DB /* oldphone-mono.wav in Resources */, + 22D8F126147548E2008C97DB /* CallHistoryTableViewController.xib in Resources */, + 22D8F127147548E2008C97DB /* in_call.png in Resources */, + 22D8F128147548E2008C97DB /* out_call.png in Resources */, + 22D8F129147548E2008C97DB /* mic_active.png in Resources */, + 22D8F12A147548E2008C97DB /* mic_muted.png in Resources */, + 22D8F12B147548E2008C97DB /* Speaker-32-on.png in Resources */, + 22D8F12C147548E2008C97DB /* Speaker-32-off.png in Resources */, + 22D8F12D147548E2008C97DB /* ConsoleViewController.xib in Resources */, + 22D8F12E147548E2008C97DB /* icone-linphone-57.png in Resources */, + 22D8F12F147548E2008C97DB /* startcall-green.png in Resources */, + 22D8F130147548E2008C97DB /* stopcall-red.png in Resources */, + 22D8F131147548E2008C97DB /* contact-orange.png in Resources */, + 22D8F132147548E2008C97DB /* dialer-orange.png in Resources */, + 22D8F133147548E2008C97DB /* history-orange.png in Resources */, + 22D8F134147548E2008C97DB /* clavier-01-106px.png in Resources */, + 22D8F135147548E2008C97DB /* clavier-01-108px.png in Resources */, + 22D8F136147548E2008C97DB /* clavier-01-160px.png in Resources */, + 22D8F137147548E2008C97DB /* linphone-banner.png in Resources */, + 22D8F138147548E2008C97DB /* MoreViewController.xib in Resources */, + 22D8F139147548E2008C97DB /* oldphone-mono-30s.caf in Resources */, + 22D8F13A147548E2008C97DB /* IncallViewController.xib in Resources */, + 22D8F13B147548E2008C97DB /* FirstLoginViewController.xib in Resources */, + 22D8F13C147548E2008C97DB /* iTunesArtwork in Resources */, + 22D8F13D147548E2008C97DB /* Localizable.strings in Resources */, + 22D8F13E147548E2008C97DB /* missed_call.png in Resources */, + 22D8F13F147548E2008C97DB /* VideoViewController.xib in Resources */, + 22D8F140147548E2008C97DB /* audio.plist in Resources */, + 22D8F141147548E2008C97DB /* video.plist in Resources */, + 22D8F142147548E2008C97DB /* rootca.pem in Resources */, + 2211DB95147564B400DEE054 /* Settings.bundle in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -1100,6 +1281,35 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 22D8F143147548E2008C97DB /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 22D8F144147548E2008C97DB /* main.m in Sources */, + 22D8F145147548E2008C97DB /* LinphoneAppDelegate.m in Sources */, + 22D8F146147548E2008C97DB /* PhoneViewController.m in Sources */, + 22D8F147147548E2008C97DB /* ContactPickerDelegate.m in Sources */, + 22D8F148147548E2008C97DB /* CallHistoryTableViewController.m in Sources */, + 22D8F149147548E2008C97DB /* GenericTabViewController.m in Sources */, + 22D8F14A147548E2008C97DB /* MoreViewController.m in Sources */, + 22D8F14B147548E2008C97DB /* ConsoleViewController.m in Sources */, + 22D8F14C147548E2008C97DB /* UIDigitButton.m in Sources */, + 22D8F14D147548E2008C97DB /* LinphoneManager.m in Sources */, + 22D8F14E147548E2008C97DB /* UICallButton.m in Sources */, + 22D8F14F147548E2008C97DB /* UIHangUpButton.m in Sources */, + 22D8F150147548E2008C97DB /* UIToggleButton.m in Sources */, + 22D8F151147548E2008C97DB /* UIMuteButton.m in Sources */, + 22D8F152147548E2008C97DB /* UISpeakerButton.m in Sources */, + 22D8F153147548E2008C97DB /* UIDuration.m in Sources */, + 22D8F154147548E2008C97DB /* FirstLoginViewController.m in Sources */, + 22D8F155147548E2008C97DB /* UIBluetoothButton.m in Sources */, + 22D8F156147548E2008C97DB /* UIEraseButton.m in Sources */, + 22D8F157147548E2008C97DB /* FastAddressBook.m in Sources */, + 22D8F158147548E2008C97DB /* VideoViewController.m in Sources */, + 22D8F159147548E2008C97DB /* UICamSwitch.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ @@ -1150,12 +1360,7 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-l", - linphone, - "-l", - mediastreamer, - ); + OTHER_LDFLAGS = ""; PRODUCT_NAME = linphone; PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; @@ -1219,13 +1424,203 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); ORDER_FILE = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = linphone; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; + SDKROOT = iphoneos; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + TARGETED_DEVICE_FAMILY = 1; + }; + name = DistributionAdhoc; + }; + 22D8F183147548E2008C97DB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = linphone_Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + IN_LINPHONE, + VIDEO_ENABLED, + ); + GCC_VERSION = com.apple.compilers.llvmgcc42; + HEADER_SEARCH_PATHS = ( + submodules/linphone/coreapi, + submodules/linphone/mediastreamer2/include, + submodules/linphone/mediastreamer2/include, + submodules/linphone/oRTP/include, + submodules/externals/gsm/, + submodules/externals/osip/include, + submodules/externals/exosip/include, + submodules/externals/speex/include, + ); + INFOPLIST_FILE = "linphone-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 3.1; + LIBRARY_SEARCH_PATHS = ( + "$(BUILT_PRODUCTS_DIR)", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", + ); + ORDER_FILE = ""; OTHER_LDFLAGS = ( "-l", linphone, "-l", mediastreamer, ); - PRODUCT_NAME = linphone; + PRODUCT_NAME = "linphone-nogpl"; + PROVISIONING_PROFILE = ""; + SDKROOT = iphoneos; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + TARGETED_DEVICE_FAMILY = 1; + }; + name = Debug; + }; + 22D8F184147548E2008C97DB /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = s; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = linphone_Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + IN_LINPHONE, + VIDEO_ENABLED, + ); + GCC_VERSION = com.apple.compilers.llvmgcc42; + HEADER_SEARCH_PATHS = ( + submodules/linphone/coreapi, + submodules/linphone/mediastreamer2/include, + submodules/linphone/mediastreamer2/include, + submodules/linphone/oRTP/include, + submodules/externals/gsm/, + submodules/externals/osip/include, + submodules/externals/exosip/include, + submodules/externals/speex/include, + ); + INFOPLIST_FILE = "linphone-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 3.1; + LIBRARY_SEARCH_PATHS = ( + "$(BUILT_PRODUCTS_DIR)", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", + ); + ORDER_FILE = ""; + OTHER_LDFLAGS = ( + "-l", + linphone, + "-l", + mediastreamer, + ); + PRODUCT_NAME = "linphone-nogpl"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; + SDKROOT = iphoneos; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + TARGETED_DEVICE_FAMILY = 1; + }; + name = Release; + }; + 22D8F185147548E2008C97DB /* Distribution */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_ENTITLEMENTS = untitled.plist; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = s; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = linphone_Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + IN_LINPHONE, + VIDEO_ENABLED, + ); + GCC_VERSION = com.apple.compilers.llvmgcc42; + HEADER_SEARCH_PATHS = ( + submodules/linphone/coreapi, + submodules/linphone/mediastreamer2/include, + submodules/linphone/mediastreamer2/include, + submodules/linphone/oRTP/include, + submodules/externals/gsm/, + submodules/externals/osip/include, + submodules/externals/exosip/include, + submodules/externals/speex/include, + ); + INFOPLIST_FILE = "linphone-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 3.1; + LIBRARY_SEARCH_PATHS = ( + "$(BUILT_PRODUCTS_DIR)", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", + ); + ORDER_FILE = ""; + OTHER_LDFLAGS = ( + "-l", + linphone, + "-l", + mediastreamer, + ); + PRODUCT_NAME = "linphone-nogpl"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; + SDKROOT = iphoneos; + STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; + TARGETED_DEVICE_FAMILY = 1; + }; + name = Distribution; + }; + 22D8F186147548E2008C97DB /* DistributionAdhoc */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_ENTITLEMENTS = untitled.plist; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = s; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = linphone_Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + IN_LINPHONE, + VIDEO_ENABLED, + ); + GCC_VERSION = com.apple.compilers.llvmgcc42; + HEADER_SEARCH_PATHS = ( + submodules/linphone/coreapi, + submodules/linphone/mediastreamer2/include, + submodules/linphone/mediastreamer2/include, + submodules/linphone/oRTP/include, + submodules/externals/gsm/, + submodules/externals/osip/include, + submodules/externals/exosip/include, + submodules/externals/speex/include, + ); + INFOPLIST_FILE = "linphone-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 3.1; + LIBRARY_SEARCH_PATHS = ( + "$(BUILT_PRODUCTS_DIR)", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins\"", + "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", + ); + ORDER_FILE = ""; + OTHER_LDFLAGS = ( + "-l", + linphone, + "-l", + mediastreamer, + ); + PRODUCT_NAME = "linphone-nogpl"; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; @@ -1287,12 +1682,7 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-l", - linphone, - "-l", - mediastreamer, - ); + OTHER_LDFLAGS = ""; PRODUCT_NAME = linphone; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; @@ -1356,12 +1746,7 @@ "\"$(SRCROOT)/liblinphone-sdk/apple-darwin/lib\"", ); ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-l", - linphone, - "-l", - mediastreamer, - ); + OTHER_LDFLAGS = ""; PRODUCT_NAME = linphone; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; @@ -1401,6 +1786,17 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 22D8F182147548E2008C97DB /* Build configuration list for PBXNativeTarget "linphone-nogpl" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 22D8F183147548E2008C97DB /* Debug */, + 22D8F184147548E2008C97DB /* Release */, + 22D8F185147548E2008C97DB /* Distribution */, + 22D8F186147548E2008C97DB /* DistributionAdhoc */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; C01FCF4E08A954540054247B /* Build configuration list for PBXProject "linphone" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 53658e4e4..4e2d6de4c 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -19,11 +19,33 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # ############################################################################ -all: - make -f builder-iphone-os.mk all \ - && make -f builder-iphone-simulator.mk all \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin all \ - && make -f builder-iphone-os.mk delivery-sdk +enable_gpl=yes + +.NOTPARALLEL all: build warning +ifeq ($(enable_gpl),yes) +warning: + @echo + @echo "*****************************************************************" + @echo "*****************************************************************" + @echo "*****CAUTION, this liblinphone SDK is built using GPL code ******" + @echo "*****To disable gpl code, use make enable_gpl=no *************" + @echo "*****************************************************************" + @echo "*****************************************************************" +else +warning: + @echo + @echo "*****************************************************************" + @echo "*****************************************************************" + @echo "*****linphone SDK without GPL code ******" + @echo "*****************************************************************" + @echo "*****************************************************************" +endif + +build: + make -f builder-iphone-os.mk all enable_gpl=$(enable_gpl) \ + && make -f builder-iphone-simulator.mk all enable_gpl=$(enable_gpl)\ + && make -f builder-iphone-os.mk host=armv7-apple-darwin all enable_gpl=$(enable_gpl)\ + && make -f builder-iphone-os.mk delivery-sdk clean: make -f builder-iphone-simulator.mk clean \ && make -f builder-iphone-os.mk clean \ diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index d9fae0fde..03ad7a851 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -21,8 +21,6 @@ ############################################################################ host?=armv6-apple-darwin -enable_zrtp?=no -enable_silk?=no config_site:=iphone-config.site library_mode:= --disable-shared --enable-static linphone_configure_controls= \ @@ -38,21 +36,11 @@ linphone_configure_controls= \ --disable-x11 \ --with-gsm=$(prefix) \ --disable-tests \ - LIBZRTPCPP_CFLAGS="-I$(prefix)/include" \ - LIBZRTPCPP_LIBS="-L$(prefix)/lib -lzrtpcpp -lcrypto" \ - SRTP_LIBS="-L$(prefix)/lib -lsrtp -lcrypto" \ - SRTP_CFLAGS="-I$(prefix)/include" \ - --enable-vp8 \ + --with-srtp=$(prefix) \ SPEEX_CFLAGS="-I$(prefix)/include" \ SPEEXDSP_CFLAGS="-I$(prefix)/include" \ SPEEXDSP_LIBS="-L$(prefix)/lib -lspeexdsp" \ - SPEEX_LIBS="-L$(prefix)/lib -lspeexdsp -lspeex " \ - OPENSSL_CFLAGS="-I$(prefix)/include" \ - OPENSSL_LIBS="-L$(prefix)/lib -lssl -lcrypto" -ifeq ($(enable_zrtp),yes) - linphone_configure_controls+= --with-srtp=$(prefix) --enable-zrtp=yes --disable-tests -endif - + SPEEX_LIBS="-L$(prefix)/lib -lspeexdsp -lspeex " #path BUILDER_SRC_DIR?=$(shell pwd)/../ @@ -61,15 +49,34 @@ BUILDER_BUILD_DIR?=$(shell pwd)/../build-$(host) LINPHONE_SRC_DIR=$(BUILDER_SRC_DIR)/linphone LINPHONE_BUILD_DIR=$(BUILDER_BUILD_DIR)/linphone -osip_dir?=externals/osip +all: build-linphone build-msilbc build-msamr build-msx264 build-mssilk -eXosip_dir?=externals/exosip +$(LINPHONE_BUILD_DIR)/enable_gpl: + mkdir -p $(LINPHONE_BUILD_DIR) + touch $(LINPHONE_BUILD_DIR)/enable_gpl + rm -f $(LINPHONE_BUILD_DIR)/disable_gpl + cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile -speex_dir?=externals/speex +$(LINPHONE_BUILD_DIR)/disable_gpl: + mkdir -p $(LINPHONE_BUILD_DIR) + touch $(LINPHONE_BUILD_DIR)/disable_gpl + rm -f $(LINPHONE_BUILD_DIR)/enable_gpl + cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile -gsm_dir?=externals/gsm +ifeq ($(enable_gpl),yes) +linphone_configure_controls+= --enable-ffmpeg --enable-zrtp +detect_gpl_mode_switch: $(LINPHONE_BUILD_DIR)/enable_gpl + +else +linphone_configure_controls+= --disable-ffmpeg --disable-zrtp +detect_gpl_mode_switch: $(LINPHONE_BUILD_DIR)/disable_gpl + +endif -zrtpcpp_dir?=externals/zrtpcpp +osip_dir=externals/osip +eXosip_dir=externals/exosip +speex_dir=externals/speex +gsm_dir=externals/gsm MSILBC_SRC_DIR:=$(BUILDER_SRC_DIR)/msilbc MSILBC_BUILD_DIR:=$(BUILDER_BUILD_DIR)/msilbc @@ -85,7 +92,6 @@ endif prefix?=$(BUILDER_SRC_DIR)/../liblinphone-sdk/$(host) -all: build-linphone build-msilbc build-msamr build-msx264 build-mssilk clean-makefile: clean-makefile-linphone clean: clean-linphone @@ -97,7 +103,7 @@ veryclean: veryclean-linphone rm -rf $(BUILDER_BUILD_DIR) -.NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm build-ffmpeg build-libvpx $(LINPHONE_BUILD_DIR)/Makefile +.NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm build-ffmpeg build-libvpx detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 @@ -166,7 +172,7 @@ $(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(eXosip_dir)/co mkdir -p $(BUILDER_BUILD_DIR)/$(eXosip_dir) cd $(BUILDER_BUILD_DIR)/$(eXosip_dir)/\ && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ - $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} CFLAGS="-I$(prefix)/include -L$(prefix)/lib -lcrypto" --enable-openssl --disable-tools + $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} CFLAGS="-I$(prefix)/include -L$(prefix)/lib -lcrypto -DMULTITASKING_ENABLED" --enable-openssl --disable-tools build-eXosip2: $(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) \ diff --git a/submodules/build/builders.d/mssilk.mk b/submodules/build/builders.d/mssilk.mk index 706496c8c..bffd7de26 100644 --- a/submodules/build/builders.d/mssilk.mk +++ b/submodules/build/builders.d/mssilk.mk @@ -20,6 +20,7 @@ # ############################################################################ mssilk_dir?=mssilk +enable_silk?=yes $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure: echo -e "\033[01;32m Running autogen for mssilk in $(BUILDER_SRC_DIR)/$(mssilk_dir) \033[0m" diff --git a/submodules/build/builders.d/openssl.mk b/submodules/build/builders.d/openssl.mk index 0b2e5bf80..076c81563 100644 --- a/submodules/build/builders.d/openssl.mk +++ b/submodules/build/builders.d/openssl.mk @@ -19,13 +19,15 @@ $(OPENSSL_BUILD_DIR)/Configure: $(OPENSSL_BUILD_DIR)/Makefile: $(OPENSSL_BUILD_DIR)/Configure cd $(OPENSSL_BUILD_DIR) \ && host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \ - && ./Configure -openssldir=$(prefix) --cross-compile-prefix=$$SDK_BIN_PATH/ BSD-generic32 no-asm + && ./Configure --prefix=$(prefix) --cross-compile-prefix=$$SDK_BIN_PATH/ BSD-generic32 no-asm build-openssl: $(OPENSSL_BUILD_DIR)/Makefile cd $(OPENSSL_BUILD_DIR) && host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \ - && make CC="$$CC" build_crypto build_ssl \ + && make CC="$$CC" build_crypto build_ssl libcrypto.pc libssl.pc\ && cp -r include $(prefix)/ \ - && cp lib*.a $(prefix)/lib + && cp lib*.a $(prefix)/lib \ + && cp libcrypto.pc $(prefix)/lib/pkgconfig/. \ + && cp libssl.pc $(prefix)/lib/pkgconfig/. \ clean-openssl: cd $(OPENSSL_BUILD_DIR) && make clean diff --git a/submodules/build/builders.d/zrtp.mk b/submodules/build/builders.d/zrtp.mk index 6b988fd6e..6dff4c4d2 100644 --- a/submodules/build/builders.d/zrtp.mk +++ b/submodules/build/builders.d/zrtp.mk @@ -1,36 +1,24 @@ -$(BUILDER_SRC_DIR)/$(zrtpcpp_dir)/CMakeLists.txt.tracker: $(BUILDER_SRC_DIR)/build/builders.d/zrtpcpp.CMakeLists.txt - cp $(BUILDER_SRC_DIR)/build/builders.d/zrtpcpp.CMakeLists.txt $(BUILDER_SRC_DIR)/$(zrtpcpp_dir)/CMakeLists.txt - - -#I coudn't manage to crosscompile using only -D arguments to cmake -#Thus the use of a toolchain file. -$(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile: $(BUILDER_SRC_DIR)/$(zrtpcpp_dir)/CMakeLists.txt.tracker +zrtpcpp_dir=externals/zrtpcpp +$(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile: mkdir -p $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/\ && host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \ && cmake $(BUILDER_SRC_DIR)/$(zrtpcpp_dir) -Denable-ccrtp=false -DCMAKE_TOOLCHAIN_FILE=$(BUILDER_SRC_DIR)build/iphone-toolchain.cmake \ -LH -Wdev -DCMAKE_C_COMPILER=$$SDK_BIN_PATH/gcc -DCMAKE_CXX_COMPILER=$$SDK_BIN_PATH/g++ \ -DCMAKE_SYSTEM_PROCESSOR=$$ARCH -DCMAKE_C_FLAGS="$$COMMON_FLAGS" -DCMAKE_CXX_FLAGS="$$COMMON_FLAGS" \ - -DCMAKE_INSTALL_PREFIX=$(prefix) -DCMAKE_FIND_ROOT_PATH="$(prefix)" + -DCMAKE_INSTALL_PREFIX=$(prefix) -DCMAKE_FIND_ROOT_PATH="$(prefix) -DBUILD_STATIC=ON " # Used toolchain: $(TC) -ifeq ($(enable_zrtp),yes) build-zrtpcpp: $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile - echo "Build ZRTP - prefix $(prefix)" + @echo "Build ZRTP - prefix $(prefix)" cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) && make VERBOSE=1 && make install -else -build-zrtpcpp: - echo "Build of zrtpcpp disabled" -endif - clean-zrtpcpp: -cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) && make clean clean-makefile-zrtpcpp: clean-zrtpcpp -rm -f $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile - -rm -f $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/CMakeCache.txt veryclean-zrtpcpp: -rm -rf $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) diff --git a/submodules/build/builders.d/zrtpcpp.CMakeLists.txt b/submodules/build/builders.d/zrtpcpp.CMakeLists.txt deleted file mode 100755 index 4f20891f6..000000000 --- a/submodules/build/builders.d/zrtpcpp.CMakeLists.txt +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright (C) 2009 Werner Dittman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -cmake_minimum_required(VERSION 2.6) - -PROJECT(libzrtpcpp) - -SET(CPACK_PACKAGE_VERSION_MAJOR 2) -SET(CPACK_PACKAGE_VERSION_MINOR 0) -SET(CPACK_PACKAGE_VERSION_PATCH 0) - -set (VERSION 2.0.0) -set (SOVERSION 2) -set (PACKAGE libzrtpcpp) - -if(MSVC60) - set(BUILD_STATIC ON CACHE BOOL "static linking only" FORCE) - MARK_AS_ADVANCED(BUILD_STATIC) -else() - option(BUILD_STATIC "Set to OFF to build shared libraries" ON) -endif() - -# set to true for debug and trace during CMakeLists development -set(CMAKE_VERBOSE_MAKEFILE FALSE) - -MESSAGE( STATUS "Configuring GNU ${PROJECT_NAME} ${VERSION}...") - -# include most of the fine stuff we need -include(cmake/Modules/FindGcryptConfig.cmake) -include(FindPkgConfig) -include(CheckLibraryExists) -include(CheckIncludeFiles) -include(cmake/Modules/AutoArgs.cmake) - -if(${PROJECT_NAME} STREQUAL ${CMAKE_PROJECT_NAME}) - include(cmake/Modules/GeneratePackage.cmake) - - GENERATE_PACKAGING(${PACKAGE} ${VERSION}) -endif() - -# check the -Denable-ccrtp setting, defaults to true -enable_arg(ccrtp true "Enable GNU ccRTP support for GNU ZRTP") -args_help() - -# this caused problems in debian where it has to always be lib.... -set(LIBDIRNAME "lib") -if (NOT EXISTS /etc/debian_version) - if ( "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" ) - set(LIBDIRNAME "lib64") - endif() -endif() - -# setup the Thread include and lib -find_package(Threads) -if(CMAKE_HAVE_PTHREAD_H) - set(HAVE_PTHREAD_H TRUE) -endif() -set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT}) - -if(enable_ccrtp) - if (USES_CCRTP_INCLUDE_DIRS) - message(STATUS " Using local commoncpp dependency") - else() - find_package(PkgConfig) - pkg_check_modules(USES_CCRTP libccrtp>=2.0.0) - endif() - include_directories(${USES_CCRTP_INCLUDE_DIRS}) - link_directories(${USES_CRTP_LIBRARY_DIRS}) - add_definitions(${USES_CCRTP_CFLAGS}) - set (LIBS ${LIBS} ${USES_CCRTP_LDFLAGS} ${USES_CCRTP_LIBRARIES}) -endif() - -if (CMAKE_CROSSCOMPILING) - include_directories(${CMAKE_INSTALL_PREFIX}/include) - link_directories(${CMAKE_INSTALL_PREFIX}/lib) - set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES} ${CMAKE_INSTALL_PREFIX}/include") -## set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_INSTALL_PREFIX}/lib/*") -endif() - - -# now get info about crypto libraries -gcr_check(GCRYPT gcrypt) -#if(GCRYPT_FOUND) -# check_include_files(gcrypt.h HAVE_GCRYPT_H) -# set(LIBS ${LIBS} ${GCRYPT_LIBRARIES}) -# set(BUILD_REQ "libgcrypt-devel") -# set(CRYPTOBACKEND="") -# set(PACKAGE_REQ "libgcrypt") -#else() - pkg_check_modules(OPENSSL libcrypto>=0.9.8) - if (OPENSSL_FOUND) - check_include_files(openssl/bn.h HAVE_OPENSSL_BN_H) - check_include_files(openssl/aes.h HAVE_OPENSSL_AES_H) - check_include_files(openssl/sha.h HAVE_OPENSSL_SHA_H) - set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -lcrypto") - check_library_exists(crypto EVP_CipherInit_ex "${CMAKE_INSTALL_PREFIX}/lib" HAVE_SSL_CRYPT) -# don't test HAVE_SSL_CRYPT_FOUND as it doesn't work - if (HAVE_OPENSSL_BN_H_FOUND) -# AND HAVE_OPENSSL_AES_H_FOUND AND HAVE_OPENSSL_SHA_H_FOUND)) - message(FATAL_ERROR "Openssl crypto library not found") - endif() - set(LIBS ${LIBS} -lcrypto) - set(CRYPTOBACKEND "libcrypto >= 0.9.8") - set(BUILD_REQ "libopenssl-devel >= 0.9.8") - set(PACKAGE_REQ "libopenssl >= 0.9.8") - else() - message(FATAL_ERROR "No crypto library found") - endif() -#endif() - -check_include_files(stdlib.h HAVE_STDLIB_H) -check_include_files(string.h HAVE_STRING_H) - -# necessary and required modules checked, ready to generate config.h -configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) - -# the following set(...) commands are only to have backward -# compatibility with autoconf stuff to generate the pc file -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix ${prefix}/bin) -set(libdir ${prefix}/lib) -set(includedir ${prefix}/include) -set(PACKAGE pkgconfig) -configure_file(libzrtpcpp.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libzrtpcpp.pc @ONLY) - -configure_file(libzrtpcpp.spec.cmake ${CMAKE_CURRENT_BINARY_DIR}/libzrtpcpp.spec @ONLY) - -include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src) - -add_definitions(-g -O2 -fno-strict-aliasing) -if(CMAKE_COMPILER_IS_GNUCXX) - add_definitions(-Wno-long-long -Wno-char-subscripts) - add_definitions(-Wall -ansi -pedantic) - add_definitions(-DNEW_STDCPP) -# add_definitions(-D__EXPORT=) -endif() - -add_subdirectory(src) - -if (enable_ccrtp) - add_subdirectory(demo) -endif() - -if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/package/) - MESSAGE(STATUS "package dir not found") - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/package/) -endif() - -########### install files ############### -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzrtpcpp.pc DESTINATION ${LIBDIRNAME}/pkgconfig) - -if(${PROJECT_NAME} STREQUAL ${CMAKE_PROJECT_NAME}) - - ########### Add uninstall target ############### - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY) - add_custom_target(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") - -endif() diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index 6ab8723a3..558ac7c38 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -38,3 +38,4 @@ RANLIB=${SDK_BIN_PATH}/ranlib CPPFLAGS="-Dasm=__asm" LDFLAGS="-Wl,-syslibroot,${SYSROOT_PATH} -framework CFNetwork" +OBJCFLAGS="-x objective-c -fexceptions -fasm-blocks -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch" diff --git a/submodules/build/iphone-toolchain.cmake.i386 b/submodules/build/iphone-toolchain.cmake.i386 deleted file mode 100644 index 0c7c1a5e5..000000000 --- a/submodules/build/iphone-toolchain.cmake.i386 +++ /dev/null @@ -1,13 +0,0 @@ -SET (CMAKE_SYSTEM_NAME "Generic") -SET (CMAKE_SYSTEM_PROCESSOR "i386") - -SET (SDKVER "4.3") -SET (DEVROOT "/Developer/Platforms/iPhoneOS.platform/Developer") -SET (SDKROOT "${DEVROOT}/SDKs/iPhoneOS${SDKVER}.sdk") - -SET (CMAKE_FIND_ROOT_PATH "${CMAKE_INSTALL_PREFIX}" "${SDKROOT}" "${DEVROOT}") -SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - - diff --git a/submodules/externals/zrtpcpp b/submodules/externals/zrtpcpp index 93dbdb315..9cac07ec1 160000 --- a/submodules/externals/zrtpcpp +++ b/submodules/externals/zrtpcpp @@ -1 +1 @@ -Subproject commit 93dbdb3159f55bb35f69c13df1f60ac4901c88fb +Subproject commit 9cac07ec1a1f57bfd0198c0895fae42a79a62a9f diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index 8d22b5213..5d1a72885 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -22,6 +22,9 @@ 220ED1A913A9041800AC21E0 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED1A813A9041800AC21E0 /* AVFoundation.framework */; }; 220ED1AC13A9062600AC21E0 /* nowebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 220ED1AA13A9062500AC21E0 /* nowebcam.h */; }; 220ED1AD13A9062600AC21E0 /* nowebcam.c in Sources */ = {isa = PBXBuildFile; fileRef = 220ED1AB13A9062500AC21E0 /* nowebcam.c */; }; + 2211DB9C1476539600DEE054 /* l16.c in Sources */ = {isa = PBXBuildFile; fileRef = 2211DB9B1476539600DEE054 /* l16.c */; }; + 2211DB9F14765CED00DEE054 /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB9E14765CEC00DEE054 /* libmssilk.a */; }; + 2211DBA1147660BB00DEE054 /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DBA0147660BB00DEE054 /* libSKP_SILK_SDK.a */; }; 221F589C13AB4FC500D603C9 /* msvideo.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F589B13AB4FC500D603C9 /* msvideo.c */; }; 221F58A013AB50F800D603C9 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 221F589F13AB50F800D603C9 /* CoreMedia.framework */; }; 221F58A213AB6F8100D603C9 /* pixconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F58A113AB6F8000D603C9 /* pixconv.c */; }; @@ -256,6 +259,9 @@ 220ED1A813A9041800AC21E0 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 220ED1AA13A9062500AC21E0 /* nowebcam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nowebcam.h; sourceTree = ""; }; 220ED1AB13A9062500AC21E0 /* nowebcam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nowebcam.c; sourceTree = ""; }; + 2211DB9B1476539600DEE054 /* l16.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = l16.c; sourceTree = ""; }; + 2211DB9E14765CEC00DEE054 /* libmssilk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmssilk.a; path = "../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmssilk.a"; sourceTree = ""; }; + 2211DBA0147660BB00DEE054 /* libSKP_SILK_SDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSKP_SILK_SDK.a; path = "../liblinphone-sdk/apple-darwin/lib/libSKP_SILK_SDK.a"; sourceTree = ""; }; 221F589913AB4EEE00D603C9 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; 221F589B13AB4FC500D603C9 /* msvideo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvideo.c; sourceTree = ""; }; 221F589D13AB503F00D603C9 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; @@ -508,6 +514,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 2211DB9F14765CED00DEE054 /* libmssilk.a in Frameworks */, 7066FC0A13E830B800EFC6DC /* libvpx.a in Frameworks */, 70E542F113E147CE002BA2C0 /* QuartzCore.framework in Frameworks */, 70E542EE13E147C7002BA2C0 /* OpenGLES.framework in Frameworks */, @@ -537,6 +544,7 @@ buildActionMask = 2147483647; files = ( AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */, + 2211DBA1147660BB00DEE054 /* libSKP_SILK_SDK.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -554,6 +562,8 @@ 0867D691FE84028FC02AAC07 /* liblinphone */ = { isa = PBXGroup; children = ( + 2211DBA0147660BB00DEE054 /* libSKP_SILK_SDK.a */, + 2211DB9E14765CEC00DEE054 /* libmssilk.a */, 7066FC0913E830B800EFC6DC /* libvpx.a */, 70E542F013E147CE002BA2C0 /* QuartzCore.framework */, 70E542ED13E147C7002BA2C0 /* OpenGLES.framework */, @@ -687,6 +697,7 @@ 222CA5DC11F6CF7600621220 /* src */ = { isa = PBXGroup; children = ( + 2211DB9B1476539600DEE054 /* l16.c */, 22512698145F13CE0041FBF2 /* aqsnd.c */, F4D9F25E14583B580035B0D0 /* bitratedriver.c */, F4D9F25F14583B580035B0D0 /* qosanalyzer.c */, @@ -1269,6 +1280,7 @@ F4D9F26014583B580035B0D0 /* bitratedriver.c in Sources */, F4D9F26114583B580035B0D0 /* qosanalyzer.c in Sources */, 22512699145F13CE0041FBF2 /* aqsnd.c in Sources */, + 2211DB9C1476539600DEE054 /* l16.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1346,6 +1358,7 @@ TARGET_OS_IPHONE, ); GCC_UNROLL_LOOPS = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; HEADER_SEARCH_PATHS = ( linphone/mediastreamer2/build/iphone, linphone/mediastreamer2/include, @@ -1359,6 +1372,10 @@ "../liblinphone-sdk/apple-darwin/include", ); INSTALL_PATH = /usr/local/lib; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"", + ); PRODUCT_NAME = linphone; SKIP_INSTALL = YES; }; @@ -1396,6 +1413,7 @@ TARGET_OS_IPHONE, ); GCC_UNROLL_LOOPS = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; HEADER_SEARCH_PATHS = ( linphone/mediastreamer2/build/iphone, linphone/mediastreamer2/include, @@ -1409,6 +1427,10 @@ "../liblinphone-sdk/apple-darwin/include", ); INSTALL_PATH = /usr/local/lib; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"", + ); PRODUCT_NAME = linphone; SKIP_INSTALL = YES; }; @@ -1572,6 +1594,7 @@ TARGET_OS_IPHONE, ); GCC_UNROLL_LOOPS = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; HEADER_SEARCH_PATHS = ( linphone/mediastreamer2/build/iphone, linphone/mediastreamer2/include, @@ -1585,6 +1608,10 @@ "../liblinphone-sdk/apple-darwin/include", ); INSTALL_PATH = /usr/local/lib; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"", + ); PRODUCT_NAME = linphone; SKIP_INSTALL = YES; }; @@ -1600,6 +1627,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "linphone/mediastreamer2/tests/ios/mediastream-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( + HAVE_SILK, "_BYTE_ORDER=_LITTLE_ENDIAN", ORTP_INET6, ENABLE_TRACE, @@ -1613,7 +1641,6 @@ "PACKAGE=\\\"ortp\\\"", "POSIXTIMER_INTERVAL=10000", IN_LINPHONE, - __IOSIOUNIT_ENABLED__, HAVE_EXOSIP_GET_SOCKET, MS2_INTERNAL, VIDEO_ENABLED, @@ -1650,6 +1677,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "linphone/mediastreamer2/tests/ios/mediastream-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( + HAVE_SILK, "_BYTE_ORDER=_LITTLE_ENDIAN", ORTP_INET6, ENABLE_TRACE, @@ -1663,7 +1691,6 @@ "PACKAGE=\\\"ortp\\\"", "POSIXTIMER_INTERVAL=10000", IN_LINPHONE, - __IOSIOUNIT_ENABLED__, HAVE_EXOSIP_GET_SOCKET, MS2_INTERNAL, VIDEO_ENABLED, @@ -1697,6 +1724,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "linphone/mediastreamer2/tests/ios/mediastream-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( + HAVE_SILK, "_BYTE_ORDER=_LITTLE_ENDIAN", ORTP_INET6, ENABLE_TRACE, @@ -1710,7 +1738,6 @@ "PACKAGE=\\\"ortp\\\"", "POSIXTIMER_INTERVAL=10000", IN_LINPHONE, - __IOSIOUNIT_ENABLED__, HAVE_EXOSIP_GET_SOCKET, MS2_INTERNAL, VIDEO_ENABLED, diff --git a/submodules/linphone b/submodules/linphone index ce510f9d1..46be0d846 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ce510f9d1fa8d66aabcca308f0d2a9174f68acd4 +Subproject commit 46be0d846485f407ea91eefc5e0161fc11e639d7