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

add polarssl into the build and update srtp to fix duplicated symbols

Browse source
This commit is contained in:
Simon Morlat 2013-05-09 18:08:47 +02:00
parent c422b7b553
commit 479031cbc8
6 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linphone.xcodeproj/project.pbxproj
View file

@ -190,6 +190,7 @@
344ABDF114850AE9007420B6 /* libc++.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDEF14850AE9007420B6 /* libc++.1.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
34A6ECEB14CF13CB00460C04 /* linphone_icon_72.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */; };
57B0E360173C010400A476B8 /* libpolarssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57B0E35F173C010400A476B8 /* libpolarssl.a */; };
57F005C415EE2CCF00914747 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 57F005C315EE2CCF00914747 /* linphonerc */; };
57F005C515EE2CCF00914747 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 57F005C315EE2CCF00914747 /* linphonerc */; };
57F005C815EE2D9200914747 /* linphonerc-factory in Resources */ = {isa = PBXBuildFile; fileRef = 57F005C615EE2D9200914747 /* linphonerc-factory */; };
@ -1707,6 +1708,7 @@
344ABDEF14850AE9007420B6 /* libc++.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.1.dylib"; path = "usr/lib/libc++.1.dylib"; sourceTree = SDKROOT; };
344ABDF014850AE9007420B6 /* libstdc++.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.6.dylib"; path = "usr/lib/libstdc++.6.dylib"; sourceTree = SDKROOT; };
34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_icon_72.png; path = Resources/linphone_icon_72.png; sourceTree = "<group>"; };
57B0E35F173C010400A476B8 /* libpolarssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpolarssl.a; path = "liblinphone-sdk/apple-darwin/lib/libpolarssl.a"; sourceTree = "<group>"; };
57F005C315EE2CCF00914747 /* linphonerc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = linphonerc; path = Resources/linphonerc; sourceTree = "<group>"; };
57F005C615EE2D9200914747 /* linphonerc-factory */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "linphonerc-factory"; path = "Resources/linphonerc-factory"; sourceTree = "<group>"; };
57F005C715EE2D9200914747 /* linphonerc-factory~ipad */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "linphonerc-factory~ipad"; path = "Resources/linphonerc-factory~ipad"; sourceTree = "<group>"; };
@ -2412,6 +2414,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
57B0E360173C010400A476B8 /* libpolarssl.a in Frameworks */,
223CA7E616D9255800EF1BEC /* libantlr3c.a in Frameworks */,
223CA7E716D9255800EF1BEC /* libbellesip.a in Frameworks */,
D30562151671DC4900C97967 /* libNinePatch.a in Frameworks */,
@ -2966,6 +2969,7 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
57B0E35F173C010400A476B8 /* libpolarssl.a */,
223CA7E416D9255800EF1BEC /* libantlr3c.a */,
223CA7E516D9255800EF1BEC /* libbellesip.a */,
2258633C11410BAC00C5A737 /* README */,

20
submodules/build/Makefile
View file

@ -35,18 +35,24 @@ endif
ifeq ($(enable_gpl_third_parties),yes)
warning:
@echo
@echo "*****************************************************************"
@echo "*****************************************************************"
@echo "*****CAUTION, this liblinphone SDK is built using GPL code ******"
@echo "*****To disable gpl code, use make enable_gpl_third_parties=no***"
@echo "*****************************************************************"
@echo "*****************************************************************"
@echo "***************************************************************************"
@echo "***************************************************************************"
@echo "*****CAUTION, this liblinphone SDK is built using 3rd party GPL code ******"
@echo "*****Even if you acquired a proprietary license from Belledonne ******"
@echo "*****Communications, this SDK is GPL and GPL only. ******"
@echo "*****To disable 3rd party gpl code, please use: ******"
@echo "*****$ make enable_gpl_third_parties=no ******"
@echo "***************************************************************************"
@echo "***************************************************************************"
else
warning:
@echo
@echo "*****************************************************************"
@echo "*****************************************************************"
@echo "*****linphone SDK without GPL code ******"
@echo "*****Linphone SDK without 3rd party GPL software ******"
@echo "*****If you acquired a proprietary license from Belledonne ******"
@echo "*****Communications, this SDK can be used to create ******"
@echo "*****a proprietary linphone-based application. ******"
@echo "*****************************************************************"
@echo "*****************************************************************"
endif

2
submodules/build/builders.d/belle-sip.mk
View file

@ -27,7 +27,7 @@ $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(belle-sip_d
mkdir -p $(BUILDER_BUILD_DIR)/$(belle-sip_dir)
cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/ \
&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
$(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} --enable-tls
$(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure --prefix=$(prefix) --host=$(host) ${library_mode} --enable-tls --with-polarssl=$(prefix)
build-belle-sip: $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/Makefile
cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install

6
submodules/build/builders.d/polarssl.mk
View file

@ -1,13 +1,13 @@
polarssl_dir?=externals/polarssl
$(BUILDER_BUILD_DIR)/$(polarssl_dir)/Makefile: $(BUILDER_SRC_DIR)/$(polarssl_dir)/Makefile
update-tree: $(BUILDER_SRC_DIR)/$(polarssl_dir)/Makefile
mkdir -p $(BUILDER_BUILD_DIR)/$(polarssl_dir)
cd $(BUILDER_BUILD_DIR)/$(polarssl_dir)/ && \
rsync -rvLpgoc --exclude ".git" $(BUILDER_SRC_DIR)/$(polarssl_dir)/ .
build-polarssl: $(BUILDER_BUILD_DIR)/$(polarssl_dir)/Makefile
build-polarssl: update-tree
host_alias=$(host) && . /$(BUILDER_SRC_DIR)/build/$(config_site) && \
cd $(BUILDER_BUILD_DIR)/$(polarssl_dir) && make lib && make install DESTDIR=$(prefix)
cd $(BUILDER_BUILD_DIR)/$(polarssl_dir) && make CC="$$CC" AR="$$AR" CPPFLAGS="$$CPPFLAGS" lib && make install DESTDIR=$(prefix)
clean-polarssl:
-cd $(BUILDER_BUILD_DIR)/$(polarssl_dir) && make clean

2
submodules/externals/polarssl vendored

@ -1 +1 @@
Subproject commit b772d5593c025e6fb945e21ee683b50ba327e211
Subproject commit d2bba11d1c5047737822adbaeae381b145c7ccba

2
submodules/externals/srtp vendored

@ -1 +1 @@
Subproject commit 152b63cba01823c391cf03600dac35fa101c8894
Subproject commit 14027d37c7574b27bf22e57f508137b4e86b6466