mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix build with new submodules

Browse source
This commit is contained in:
Benjamin Reis 2017-11-22 17:45:19 +01:00
parent 02efced1c9
commit 23cbaccd24
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/ChatConversationView.m
View file

@ -343,7 +343,7 @@ static UICompositeViewDescription *compositeDescription = nil;
// pull up the composing frame and shrink the table view
newTableFrame.size.height -= newComposingFrame.size.height;
newComposingFrame.origin.y = keyboardFrame.origin.y - newComposingFrame.size.height;
bctbx_list_t *addresses = linphone_chat_room_get_composing_addresses(_chatRoom);
const bctbx_list_t *addresses = linphone_chat_room_get_composing_addresses(_chatRoom);
NSString *composingAddresses = @"";
if (bctbx_list_size(addresses) == 1) {
composingAddresses = [NSString stringWithUTF8String:linphone_address_get_username((LinphoneAddress *)addresses->data)];

8
linphone.xcodeproj/project.pbxproj
View file

@ -4714,7 +4714,7 @@
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "-DORTP_LOG_DOMAIN=\\\"ios\\\"";
OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PROVISIONING_PROFILE = "0636A6EA-90EB-4D92-B707-19FC32F9A7CF";
SDKROOT = iphoneos;
@ -4817,7 +4817,7 @@
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "-DORTP_LOG_DOMAIN=\\\"ios\\\"";
OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
@ -4920,7 +4920,7 @@
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "-DORTP_LOG_DOMAIN=\\\"ios\\\"";
OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PROVISIONING_PROFILE = "C7F794BC-6D48-41F2-B37D-E1B1B1A40901";
SDKROOT = iphoneos;
@ -5025,7 +5025,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LIBRARY_SEARCH_PATHS = "";
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DORTP_LOG_DOMAIN=\\\"ios\\\"";
OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PROVISIONING_PROFILE = "2AC0DC11-4546-47B6-8B8A-453CCA80903C";
SDKROOT = iphoneos;

2
submodules/bctoolbox

@ -1 +1 @@
Subproject commit 02caea7df8381b0c5dadcfbfd39ff0b33a2577b7
Subproject commit 81867f1d8c26a10db632f9d0c1a61afa14d58432

2
submodules/ortp

@ -1 +1 @@
Subproject commit 3319a460d5f55b343899c091cb15c395a4f3fea4
Subproject commit e4883ff0108622e10046b818a268f141218fb221