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

Merge branch 'master' into tunnel

Browse source 
Conflicts:
	submodules/build/builder-iphone-os.mk
This commit is contained in:
Jehan Monnier 2011-03-19 18:31:27 +01:00
commit be1999b391
3 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,10 +60,8 @@ LIBILBC_BUILD_DIR:=$(BUILDER_BUILD_DIR)/libilbc-rfc3951
ifneq (,$(findstring arm,$(host)))
SPEEX_CONFIGURE_OPTION := --enable-fixed-point --disable-float-api
OPENSSL_ZIP := openssl-0.9.8j-arm.zip
#SPEEX_CONFIGURE_OPTION := --enable-arm5e-asm --enable-fixed-point
else
OPENSSL_ZIP := openssl-0.9.8j-i386.zip
endif
@ -142,7 +140,7 @@ clean-makefile-osip2:
$(BUILDER_SRC_DIR)/$(eXosip_dir)/configure:
cd $(BUILDER_SRC_DIR)/$(eXosip_dir) && ./autogen.sh
$(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure $(prefix)/include/openssl/ssl.h
$(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure
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) \
@ -256,9 +254,7 @@ clean-makefile-libilbc:
cd $(LIBILBC_BUILD_DIR) && rm -f Makefile
#openssl
include builders.d/*.mk
#sdk generation and distribution
multi-arch:

BIN
submodules/prebuilt/openssl-0.9.8j-arm.zip
View file

Binary file not shown.

BIN
submodules/prebuilt/openssl-0.9.8j-i386.zip
View file

Binary file not shown.