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

remove ssl compilation from exosip

Browse source
This commit is contained in:
Jehan Monnier 2011-04-12 10:00:06 +02:00
parent c1e7f78f1a
commit 0a59882bcd
5 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
linphone.xcodeproj/project.pbxproj
View file

@ -67,9 +67,9 @@
22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B5F03410CE6B2F00777D97 /* AddressBook.framework */; };
22BB1B9313311915005CD7AA /* libtunnel.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22BB1B9213311915005CD7AA /* libtunnel.a */; };
22BB1D3613322A58005CD7AA /* UIEraseButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22BB1D3413322A58005CD7AA /* UIEraseButton.m */; };
22BFFF7B134F6AEA00997020 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22BFFF79134F6AEA00997020 /* libssl.a */; };
22BFFF7C134F6AEA00997020 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22BFFF7A134F6AEA00997020 /* libcrypto.a */; };
22C755601317E59C007BC101 /* UIBluetoothButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22C7555F1317E59C007BC101 /* UIBluetoothButton.m */; };
22C7564D13265CF8007BC101 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22C7564C13265CF8007BC101 /* libcrypto.a */; };
22C7564F13265CF8007BC101 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22C7564E13265CF8007BC101 /* libssl.a */; };
22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B68012A3E0BE001AE361 /* libresolv.dylib */; };
22E0A785111C1BA800B04932 /* Speaker-32-on.png in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A783111C1BA800B04932 /* Speaker-32-on.png */; };
22E0A786111C1BA800B04932 /* Speaker-32-off.png in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A784111C1BA800B04932 /* Speaker-32-off.png */; };
@ -300,6 +300,8 @@
22BB1B9213311915005CD7AA /* libtunnel.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtunnel.a; path = "/Users/jehanmonnier/workspaces/workspace-iphone-port/linphone-iphone/liblinphone-sdk/apple-darwin/lib/libtunnel.a"; sourceTree = "<absolute>"; };
22BB1D3413322A58005CD7AA /* UIEraseButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIEraseButton.m; sourceTree = "<group>"; };
22BB1D3513322A58005CD7AA /* UIEraseButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEraseButton.h; sourceTree = "<group>"; };
22BFFF79134F6AEA00997020 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = "<group>"; };
22BFFF7A134F6AEA00997020 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = "<group>"; };
22C7555E1317E59C007BC101 /* UIBluetoothButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIBluetoothButton.h; sourceTree = "<group>"; };
22C7555F1317E59C007BC101 /* UIBluetoothButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIBluetoothButton.m; sourceTree = "<group>"; };
22C7560513265C6A007BC101 /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = "<group>"; };
@ -373,8 +375,6 @@
22C7564913265C6A007BC101 /* x509.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509.h; sourceTree = "<group>"; };
22C7564A13265C6A007BC101 /* x509_vfy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509_vfy.h; sourceTree = "<group>"; };
22C7564B13265C6A007BC101 /* x509v3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509v3.h; sourceTree = "<group>"; };
22C7564C13265CF8007BC101 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "/Users/jehanmonnier/workspaces/workspace-iphone-reltime/linphone-iphone/liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = "<absolute>"; };
22C7564E13265CF8007BC101 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "/Users/jehanmonnier/workspaces/workspace-iphone-reltime/linphone-iphone/liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = "<absolute>"; };
22D1B68012A3E0BE001AE361 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = usr/lib/libresolv.dylib; sourceTree = SDKROOT; };
22E0A783111C1BA800B04932 /* Speaker-32-on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Speaker-32-on.png"; path = "Resources/Speaker-32-on.png"; sourceTree = "<group>"; };
22E0A784111C1BA800B04932 /* Speaker-32-off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Speaker-32-off.png"; path = "Resources/Speaker-32-off.png"; sourceTree = "<group>"; };
@ -400,6 +400,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
22BFFF7B134F6AEA00997020 /* libssl.a in Frameworks */,
22BFFF7C134F6AEA00997020 /* libcrypto.a in Frameworks */,
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */,
@ -421,8 +423,6 @@
22A10F3B11F8960300373793 /* libortp.a in Frameworks */,
22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */,
2252941412F6DAA400DD9BFB /* libmediastreamer.a in Frameworks */,
22C7564D13265CF8007BC101 /* libcrypto.a in Frameworks */,
22C7564F13265CF8007BC101 /* libssl.a in Frameworks */,
22BB1B9313311915005CD7AA /* libtunnel.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -799,6 +799,8 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
22BFFF79134F6AEA00997020 /* libssl.a */,
22BFFF7A134F6AEA00997020 /* libcrypto.a */,
22323023132A286700F10886 /* src */,
22A10D9E11F88C1F00373793 /* liblinphone.xcodeproj */,
223148E51178A09900637D6A /* libmsilbc.a */,
@ -830,8 +832,6 @@
2258633C11410BAC00C5A737 /* README */,
228697C311AC29B800E9E0CA /* CFNetwork.framework */,
22D1B68012A3E0BE001AE361 /* libresolv.dylib */,
22C7564C13265CF8007BC101 /* libcrypto.a */,
22C7564E13265CF8007BC101 /* libssl.a */,
22BB1B9213311915005CD7AA /* libtunnel.a */,
);
name = CustomTemplate;

4
submodules/build/builder-iphone-os.mk
View file

@ -27,7 +27,7 @@ linphone_configure_controls= --disable-video \
--with-readline=none \
--enable-gtk_ui=no \
--enable-ssl-hmac=no \
--enable-ssl=yes \
--enable-ssl=no \
--enable-macaqsnd=no \
--enable-macsnd=no \
--enable-iounit=yes \
@ -145,7 +145,7 @@ $(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(eXosip_dir)/co
mkdir -p $(BUILDER_BUILD_DIR)/$(eXosip_dir)
cd $(BUILDER_BUILD_DIR)/$(eXosip_dir)/\
&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
$(BUILDER_SRC_DIR)/$(eXosip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} CFLAGS="-I$(prefix)/include -L$(prefix)/lib -lcrypto" --enable-openssl --disable-tools
$(BUILDER_SRC_DIR)/$(eXosip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} CFLAGS="-I$(prefix)/include -L$(prefix)/lib -lcrypto" --disable-openssl --disable-tools
build-eXosip2: $(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile
cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) \

4
submodules/build/builders.d/tunnel.mk
View file

@ -12,7 +12,9 @@ $(TUNNEL_BUILD_DIR)/Makefile: $(TUNNEL_SRC_DIR)/configure
$(TUNNEL_SRC_DIR)/configure -prefix=$(prefix) --host=$(host) ${library_mode}
build-tunnel: $(TUNNEL_BUILD_DIR)/Makefile
cd $(TUNNEL_BUILD_DIR) && make && make install
cd $(TUNNEL_BUILD_DIR) \
&& export OPENSSL_CFLAGS="-I$(prefix)/include" export OPENSSL_LIBS="-L$(prefix)/lib -lssl -lcrypto" export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
&& make && make install
clean-tunnel:
cd $(TUNNEL_BUILD_DIR) && make clean

2
submodules/linphone

@ -1 +1 @@
Subproject commit 6de1632771312395faa5b9c340dddbf86fa17ed0
Subproject commit e11983452ab9c376b8b851db1bc660392f68d0c9

2
submodules/tunnel

@ -1 +1 @@
Subproject commit 35e72d0c3a383da8865fbf37e5e13b6cfd9483fd
Subproject commit 70efb2245fe7230990a6a9d945d79af558a08381