mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-24 22:58:13 +00:00
fix msiounit
This commit is contained in:
parent
7ba162c58b
commit
86699c4bb7
6 changed files with 621 additions and 221 deletions
|
|
@ -31,7 +31,7 @@
|
|||
#import "LinphoneCoreSettingsStore.h"
|
||||
#import "ChatModel.h"
|
||||
|
||||
#include "linphonecore_utils.h"
|
||||
#include "linphone/linphonecore_utils.h"
|
||||
#include "lpconfig.h"
|
||||
|
||||
#define LINPHONE_LOGS_MAX_ENTRY 5000
|
||||
|
|
@ -780,7 +780,7 @@ static LinphoneCoreVTable linphonec_vtable = {
|
|||
.show =NULL,
|
||||
.call_state_changed =(LinphoneCallStateCb)linphone_iphone_call_state,
|
||||
.registration_state_changed = linphone_iphone_registration_state,
|
||||
.notify_recv = NULL,
|
||||
.notify_presence_recv=NULL,
|
||||
.new_subscription_request = NULL,
|
||||
.auth_info_requested = NULL,
|
||||
.display_status = linphone_iphone_display_status,
|
||||
|
|
|
|||
|
|
@ -5451,7 +5451,6 @@
|
|||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
||||
GCC_PREFIX_HEADER = linphone_Prefix.pch;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
IN_LINPHONE,
|
||||
VIDEO_ENABLED,
|
||||
HAVE_X264,
|
||||
HAVE_SILK,
|
||||
|
|
@ -5460,14 +5459,7 @@
|
|||
);
|
||||
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
|
||||
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,
|
||||
"liblinphone-sdk/apple-darwin/include",
|
||||
Classes/Utils/NinePatch/,
|
||||
Classes/Utils/XMLRPC/,
|
||||
);
|
||||
|
|
@ -5533,14 +5525,7 @@
|
|||
);
|
||||
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
|
||||
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,
|
||||
"liblinphone-sdk/apple-darwin/include",
|
||||
Classes/Utils/NinePatch/,
|
||||
Classes/Utils/XMLRPC/,
|
||||
);
|
||||
|
|
@ -5776,14 +5761,7 @@
|
|||
);
|
||||
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
|
||||
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,
|
||||
"liblinphone-sdk/apple-darwin/include",
|
||||
Classes/Utils/NinePatch/,
|
||||
Classes/Utils/XMLRPC/,
|
||||
);
|
||||
|
|
@ -5848,14 +5826,7 @@
|
|||
);
|
||||
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
|
||||
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,
|
||||
"liblinphone-sdk/apple-darwin/include",
|
||||
Classes/Utils/NinePatch/,
|
||||
Classes/Utils/XMLRPC/,
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 89aa5d6a1b9957b73696f250043b799b462a5c0f
|
||||
Subproject commit 8b7546d3bebce04c9c67457bfe44805e0b87caee
|
||||
|
|
@ -21,6 +21,7 @@
|
|||
############################################################################
|
||||
enable_gpl_third_parties=yes
|
||||
enable_zrtp=no
|
||||
enable_opus=yes
|
||||
|
||||
.NOTPARALLEL all: check_options build warning
|
||||
ifeq ($(enable_gpl_third_parties)$(enable_zrtp),noyes)
|
||||
|
|
@ -57,7 +58,7 @@ warning:
|
|||
@echo "*****************************************************************"
|
||||
endif
|
||||
|
||||
LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp)
|
||||
LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) enable_opus=$(enable_opus)
|
||||
|
||||
build:
|
||||
make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1 +1 @@
|
|||
Subproject commit 6e3c6551a9cac6d231910420386e9666a0a30c0b
|
||||
Subproject commit f55699af8e9a6a0c595fbbc1adac612f96b48fc9
|
||||
Loading…
Add table
Reference in a new issue