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

Merge remote-tracking branch 'origin/master' into wip_video_ui_improvements

Browse source 
Conflicts:
	linphonerc
	submodules/linphone
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2012-04-05 12:49:14 +02:00
commit e17770bb85
5 changed files with 1065 additions and 215 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/LinphoneAppDelegate.m
View file

@ -145,10 +145,12 @@ int __aeabi_idiv(int a, int b) {
NSMutableDictionary *rootSettings = [NSDictionary dictionaryWithContentsOfFile:[settingsBundle stringByAppendingPathComponent:@"Root.plist"]];
NSMutableDictionary *audioSettings = [NSDictionary dictionaryWithContentsOfFile:[settingsBundle stringByAppendingPathComponent:@"audio.plist"]];
NSMutableDictionary *videoSettings = [NSDictionary dictionaryWithContentsOfFile:[settingsBundle stringByAppendingPathComponent:@"video.plist"]];
NSMutableDictionary *advancedSettings = [NSDictionary dictionaryWithContentsOfFile:[settingsBundle stringByAppendingPathComponent:@"Advanced.plist"]];
NSMutableArray *preferences = [rootSettings objectForKey:@"PreferenceSpecifiers"];
[preferences addObjectsFromArray:[audioSettings objectForKey:@"PreferenceSpecifiers"]];
[preferences addObjectsFromArray:[videoSettings objectForKey:@"PreferenceSpecifiers"]];
[preferences addObjectsFromArray:[advancedSettings objectForKey:@"PreferenceSpecifiers"]];
NSMutableDictionary *defaultsToRegister = [[NSMutableDictionary alloc] initWithCapacity:[preferences count]];

BIN
nogpl-thirdparties/.DS_Store vendored
View file

Binary file not shown.

24
submodules/build/Makefile
View file

@ -22,7 +22,16 @@
enable_gpl_third_parties=yes
enable_zrtp=no
.NOTPARALLEL all: build warning
.NOTPARALLEL all: check_options build warning
ifeq ($(enable_gpl_third_parties)$(enable_zrtp),noyes)
check_options:
@echo "ZRTP is not available in non-gpl build."
@exit -1
else
check_options:
endif
ifeq ($(enable_gpl_third_parties),yes)
warning:
@echo
@ -40,18 +49,14 @@ warning:
@echo "*****linphone SDK without GPL code ******"
@echo "*****************************************************************"
@echo "*****************************************************************"
ifeq($(enable_zrtp),yes)
@echo "ZRTP is not available in non-gpl build."
enable_zrtp=no
endif
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)
build:
make -f builder-iphone-os.mk all $(LINPHONE_OPTIONS) \
&& make -f builder-iphone-simulator.mk all $(LINPHONE_OPTIONS) \
&& make -f builder-iphone-os.mk host=armv7-apple-darwin all $(LINPHONE_OPTIONS) \
make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) all \
&& make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \
&& make -f builder-iphone-os.mk host=armv7-apple-darwin $(LINPHONE_OPTIONS) all \
&& make -f builder-iphone-os.mk delivery-sdk
ipa: build
@ -73,3 +78,4 @@ veryclean:
make -f builder-iphone-simulator.mk veryclean \
&& make -f builder-iphone-os.mk veryclean \
&& make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean

1252
submodules/liblinphone.xcodeproj/project.pbxproj
View file

File diff suppressed because it is too large Load diff

2
submodules/linphone

@ -1 +1 @@
Subproject commit e7123e495aa88c5432b1a7c21e5f9de39ef5bc90
Subproject commit 30eca09f41d40af19a67e64912a35bf1e313cd30