mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix compilation

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-09-29 12:11:02 +02:00
parent 614137cd79
commit ab3fa1a0c7
11 changed files with 105 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Classes/Base.lproj/CallOutgoingView.xib
View file

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CallOutgoingView">
@ -35,7 +36,7 @@
<rect key="frame" x="46" y="58" width="283" height="283"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<accessibility key="accessibilityConfiguration" label="Contact avatar">
<accessibilityTraits key="traits" none="YES" image="YES" notEnabled="YES"/>
<accessibilityTraits key="traits" image="YES" notEnabled="YES"/>
<bool key="isElement" value="YES"/>
</accessibility>
</imageView>
@ -46,9 +47,9 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="john.doe@sip.linphone.org" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="8" id="2fa-Ag-3GW" userLabel="addressLabel">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="john.doe@sip.linphone.org" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="8" id="2fa-Ag-3GW" userLabel="addressLabel">
<rect key="frame" x="90" y="399" width="194" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="1" green="0.36862745099999999" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@ -107,19 +108,14 @@
</view>
</objects>
<resources>
<image name="avatar.png" width="261" height="261"/>
<image name="call_hangup.png" width="42" height="37"/>
<image name="avatar.png" width="255" height="255"/>
<image name="call_hangup.png" width="41" height="36"/>
<image name="color_D.png" width="1" height="1"/>
<image name="color_F.png" width="1" height="1"/>
<image name="color_I.png" width="1" height="1"/>
<image name="micro_default.png" width="30" height="38"/>
<image name="micro_selected.png" width="30" height="38"/>
<image name="speaker_default.png" width="28" height="26"/>
<image name="speaker_selected.png" width="28" height="26"/>
<image name="micro_default.png" width="29" height="37"/>
<image name="micro_selected.png" width="29" height="37"/>
<image name="speaker_default.png" width="27" height="25"/>
<image name="speaker_selected.png" width="27" height="25"/>
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
</document>

19
Classes/Base.lproj/ContactsListView.xib
View file

@ -101,6 +101,9 @@
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted" backgroundImage="color_E.png"/>
<connections>
<action selector="onEditClick:" destination="-1" eventType="touchUpInside" id="SYP-yf-EhC"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6" userLabel="addButton" customClass="UIIconButton">
<rect key="frame" x="300" y="0.0" width="75" height="42"/>
@ -162,15 +165,15 @@
</tableViewController>
</objects>
<resources>
<image name="back.png" width="48" height="44"/>
<image name="back.png" width="24" height="21"/>
<image name="color_E.png" width="1" height="1"/>
<image name="color_F.png" width="1" height="1"/>
<image name="contact_add.png" width="69" height="59"/>
<image name="contacts_all_default.png" width="65" height="55"/>
<image name="contacts_all_selected.png" width="65" height="55"/>
<image name="contacts_sip_default.png" width="77" height="60"/>
<image name="contacts_sip_selected.png" width="77" height="60"/>
<image name="delete.png" width="43" height="56"/>
<image name="edit_list.png" width="60" height="57"/>
<image name="contact_add.png" width="34" height="29"/>
<image name="contacts_all_default.png" width="32" height="27"/>
<image name="contacts_all_selected.png" width="32" height="27"/>
<image name="contacts_sip_default.png" width="38" height="29"/>
<image name="contacts_sip_selected.png" width="38" height="29"/>
<image name="delete.png" width="21" height="27"/>
<image name="edit_list.png" width="29" height="28"/>
</resources>
</document>

47
Classes/Base.lproj/DialerView.xib
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DialerView">
@ -52,7 +52,7 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" label="Enter a address"/>
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="36"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="emailAddress"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="alphabet"/>
<connections>
<action selector="onAddressChange:" destination="-1" eventType="editingChanged" id="208"/>
<outlet property="delegate" destination="-1" id="190"/>
@ -304,33 +304,28 @@
</view>
</objects>
<resources>
<image name="back.png" width="25" height="22"/>
<image name="backspace_default.png" width="37" height="19"/>
<image name="backspace_over.png" width="37" height="19"/>
<image name="call_add.png" width="40" height="36"/>
<image name="call_alt_start.png" width="30" height="30"/>
<image name="call_transfer.png" width="41" height="37"/>
<image name="back.png" width="24" height="21"/>
<image name="backspace_default.png" width="36" height="19"/>
<image name="backspace_over.png" width="36" height="19"/>
<image name="call_add.png" width="39" height="35"/>
<image name="call_alt_start.png" width="29" height="29"/>
<image name="call_transfer.png" width="40" height="36"/>
<image name="color_A.png" width="1" height="1"/>
<image name="color_E.png" width="1" height="1"/>
<image name="color_F.png" width="1" height="1"/>
<image name="color_L.png" width="1" height="1"/>
<image name="contact_add.png" width="35" height="30"/>
<image name="numpad_0.png" width="53" height="50"/>
<image name="numpad_1.png" width="53" height="49"/>
<image name="numpad_2.png" width="53" height="50"/>
<image name="numpad_3.png" width="53" height="50"/>
<image name="numpad_4.png" width="53" height="49"/>
<image name="numpad_5.png" width="53" height="49"/>
<image name="numpad_6.png" width="53" height="50"/>
<image name="numpad_7.png" width="53" height="49"/>
<image name="numpad_8.png" width="53" height="50"/>
<image name="numpad_9.png" width="53" height="50"/>
<image name="contact_add.png" width="34" height="29"/>
<image name="numpad_0.png" width="52" height="48"/>
<image name="numpad_1.png" width="52" height="48"/>
<image name="numpad_2.png" width="52" height="48"/>
<image name="numpad_3.png" width="52" height="48"/>
<image name="numpad_4.png" width="52" height="48"/>
<image name="numpad_5.png" width="52" height="48"/>
<image name="numpad_6.png" width="52" height="48"/>
<image name="numpad_7.png" width="52" height="48"/>
<image name="numpad_8.png" width="52" height="48"/>
<image name="numpad_9.png" width="52" height="48"/>
<image name="numpad_sharp.png" width="53" height="50"/>
<image name="numpad_star.png" width="53" height="52"/>
<image name="numpad_star.png" width="52" height="50"/>
</resources>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
</document>

1
Classes/ContactsListView.h
View file

@ -92,5 +92,6 @@ typedef enum _ContactSelectionMode {
- (IBAction)onLinphoneClick:(id)event;
- (IBAction)onAddContactClick:(id)event;
- (IBAction)onBackClick:(id)event;
- (IBAction)onEditClick:(id)sender;
@end

3
Classes/ContactsListView.m
View file

@ -243,6 +243,9 @@ static UICompositeViewDescription *compositeDescription = nil;
[PhoneMainView.instance popCurrentView];
}
- (IBAction)onEditClick:(id)sender {
}
- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {
[self searchBar:searchBar textDidChange:@""];
[searchBar resignFirstResponder];

1
Classes/HistoryListView.h
View file

@ -27,7 +27,6 @@
}
@property(nonatomic, strong) IBOutlet HistoryListTableView *tableController;
@property(nonatomic, strong) IBOutlet UITableView *tableView;
@property(nonatomic, strong) IBOutlet UIButton *allButton;
@property(nonatomic, strong) IBOutlet UIButton *missedButton;

10
Classes/HistoryListView.m
View file

@ -22,7 +22,6 @@
@implementation HistoryListView
@synthesize tableView;
@synthesize tableController;
@synthesize allButton;
@ -79,7 +78,8 @@ static UICompositeViewDescription *compositeDescription = nil;
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
editButton.hidden = ([[tableView dataSource] tableView:tableView numberOfRowsInSection:0] == 0);
// editButton.hidden = ([[tableController.tableView dataSource] tableView:tableController.tableView
// numberOfRowsInSection:0] == 0);
}
- (void)viewDidLoad {
@ -104,7 +104,8 @@ static UICompositeViewDescription *compositeDescription = nil;
missedButton.selected = FALSE;
}
editButton.hidden = ([[tableView dataSource] tableView:tableView numberOfRowsInSection:0] == 0);
// editButton.hidden = ([[tableController.tableView dataSource] tableView:tableController.tableView
// numberOfRowsInSection:0] == 0);
}
#pragma mark - Action Functions
@ -125,7 +126,8 @@ static UICompositeViewDescription *compositeDescription = nil;
- (IBAction)onDeleteClick:(id)event {
linphone_core_clear_call_logs([LinphoneManager getLc]);
[tableController loadData];
editButton.hidden = ([[tableView dataSource] tableView:tableView numberOfRowsInSection:0] == 0);
// editButton.hidden = ([[tableController.tableView dataSource] tableView:tableController.tableView
// numberOfRowsInSection:0] == 0);
if ([editButton isSelected]) {
[editButton toggle];
[self onEditClick:nil];

2
Classes/LinphoneUI/UIHistoryCell.m
View file

@ -63,7 +63,7 @@
- (IBAction)onDelete:(id)event {
if (callLog != NULL) {
UITableView *tableView = VIEW(HistoryListView).tableView;
UITableView *tableView = VIEW(HistoryListView).tableController.tableView;
NSIndexPath *indexPath = [tableView indexPathForCell:self];
[[tableView dataSource] tableView:tableView
commitEditingStyle:UITableViewCellEditingStyleDelete

89
linphone.xcodeproj/project.pbxproj
View file

@ -341,6 +341,16 @@
63CFEE0C1B9EDD88007EA5BD /* libmsx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AA8AFC13D7125500B30535 /* libmsx264.a */; };
63CFEE131B9EDF65007EA5BD /* libvo-amrwbenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63CFEDE31B9EDD36007EA5BD /* libvo-amrwbenc.a */; };
63E59A3F1ADE70D900646FB3 /* InAppProductsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 63E59A3E1ADE70D900646FB3 /* InAppProductsManager.m */; };
63EEE3FF1BBA9AC00087D3AF /* libcunit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A9B7E18C0D9C900C4D7FE /* libcunit.a */; };
63EEE4001BBA9AC00087D3AF /* liblinphonetester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0BB8C0F193623F200974404 /* liblinphonetester.a */; };
63EEE4041BBA9B010087D3AF /* libbellesip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223CA7E516D9255800EF1BEC /* libbellesip.a */; };
63EEE4051BBA9B010087D3AF /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB911475562600DEE054 /* liblinphone.a */; };
63EEE4061BBA9B010087D3AF /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EE916006F0700B92522 /* libmediastreamer_base.a */; };
63EEE4071BBA9B010087D3AF /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EEA16006F0700B92522 /* libmediastreamer_voip.a */; };
63EEE4081BBA9B010087D3AF /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2C10765B400068D98F /* libortp.a */; };
63EEE40A1BBA9B110087D3AF /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 63EEE4091BBA9B110087D3AF /* libxml2.tbd */; };
63EEE40C1BBA9B1B0087D3AF /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 63EEE40B1BBA9B1B0087D3AF /* libsqlite3.tbd */; };
63EEE40E1BBA9B250087D3AF /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 63EEE40D1BBA9B250087D3AF /* libiconv.tbd */; };
63FB30351A680E73008CA393 /* UIRoundedImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63FB30341A680E73008CA393 /* UIRoundedImageView.m */; };
70E542F313E147E3002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F213E147E3002BA2C0 /* OpenGLES.framework */; };
70E542F513E147EB002BA2C0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F413E147EB002BA2C0 /* QuartzCore.framework */; };
@ -941,6 +951,9 @@
63E59A3D1ADE6ECB00646FB3 /* InAppProductsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InAppProductsManager.h; sourceTree = "<group>"; };
63E59A3E1ADE70D900646FB3 /* InAppProductsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InAppProductsManager.m; sourceTree = "<group>"; };
63EA4C941B50189D00922857 /* libmswebrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmswebrtc.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmswebrtc.a"; sourceTree = "<group>"; };
63EEE4091BBA9B110087D3AF /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = usr/lib/libxml2.tbd; sourceTree = SDKROOT; };
63EEE40B1BBA9B1B0087D3AF /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
63EEE40D1BBA9B250087D3AF /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
63EF7FDC1A24B5810017A416 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AboutView.strings; sourceTree = "<group>"; };
63FB30331A680E73008CA393 /* UIRoundedImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIRoundedImageView.h; sourceTree = "<group>"; };
63FB30341A680E73008CA393 /* UIRoundedImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIRoundedImageView.m; sourceTree = "<group>"; };
@ -1300,6 +1313,16 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
63EEE40E1BBA9B250087D3AF /* libiconv.tbd in Frameworks */,
63EEE40C1BBA9B1B0087D3AF /* libsqlite3.tbd in Frameworks */,
63EEE40A1BBA9B110087D3AF /* libxml2.tbd in Frameworks */,
63EEE4041BBA9B010087D3AF /* libbellesip.a in Frameworks */,
63EEE4051BBA9B010087D3AF /* liblinphone.a in Frameworks */,
63EEE4061BBA9B010087D3AF /* libmediastreamer_base.a in Frameworks */,
63EEE4071BBA9B010087D3AF /* libmediastreamer_voip.a in Frameworks */,
63EEE4081BBA9B010087D3AF /* libortp.a in Frameworks */,
63EEE3FF1BBA9AC00087D3AF /* libcunit.a in Frameworks */,
63EEE4001BBA9AC00087D3AF /* liblinphonetester.a in Frameworks */,
63058A4F1B4E835200EFAE36 /* libKIF.a in Frameworks */,
F0FF66AC1ACAEF4F008A4486 /* IOKit.framework in Frameworks */,
);
@ -1522,6 +1545,9 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
63EEE40D1BBA9B250087D3AF /* libiconv.tbd */,
63EEE40B1BBA9B1B0087D3AF /* libsqlite3.tbd */,
63EEE4091BBA9B110087D3AF /* libxml2.tbd */,
63CFEDE21B9EDD36007EA5BD /* libswresample.a */,
63CFEDE31B9EDD36007EA5BD /* libvo-amrwbenc.a */,
63CFEDE41B9EDD36007EA5BD /* libbcg729.a */,
@ -2159,7 +2185,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0640;
LastUpgradeCheck = 0700;
TargetAttributes = {
1D6058900D05DD3D006BFB54 = {
DevelopmentTeam = Z2V957B3D6;
@ -3138,6 +3164,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier";
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_THUMB_SUPPORT = NO;
@ -3222,6 +3249,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_THUMB_SUPPORT = NO;
@ -3306,6 +3334,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier";
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_THUMB_SUPPORT = NO;
@ -3390,7 +3419,9 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)";
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@ -3428,11 +3459,6 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR)",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@ -3484,11 +3510,6 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR)",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "TestsLiblinphone/LinphoneTesterTests-Prefix.pch";
@ -3533,11 +3554,6 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR)",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "TestsLiblinphone/LinphoneTesterTests-Prefix.pch";
@ -3582,11 +3598,6 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR)",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "TestsLiblinphone/LinphoneTesterTests-Prefix.pch";
@ -3834,11 +3845,6 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR)",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
@ -3857,6 +3863,10 @@
);
INFOPLIST_FILE = TestsUI/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
);
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
@ -3886,11 +3896,6 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR)",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
@ -3902,6 +3907,10 @@
);
INFOPLIST_FILE = TestsUI/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
);
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = (
"$(inherited)",
@ -3931,11 +3940,6 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR)",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
@ -3947,6 +3951,10 @@
);
INFOPLIST_FILE = TestsUI/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
);
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = (
"$(inherited)",
@ -3976,11 +3984,6 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR)",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
@ -3992,6 +3995,10 @@
);
INFOPLIST_FILE = TestsUI/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/liblinphone-sdk/apple-darwin/lib",
);
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = (
"$(inherited)",

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 9bf1eecf12bb8a0884025d35de9b50b0875b9ecc
Subproject commit 6fce3a793570e9920f18c29f411b9204249e229f

2
submodules/linphone

@ -1 +1 @@
Subproject commit 7cbbb6b17e4f1de3fa48f89c541092754f3455b4
Subproject commit 89c028313929f36eb0161e55dfb977fc9ae779d4