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

Fix opencore amr old scripts and fix name collision in ms2 through linphone

Browse source
This commit is contained in:
Guillaume BIENKOWSKI 2014-11-19 13:13:31 +01:00
parent 1d7fb11ee2
commit ca62c24342
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitmodules vendored
View file

@ -16,6 +16,7 @@
[submodule "submodules/externals/opencore-amr"]
path = submodules/externals/opencore-amr
url = git://git.code.sf.net/p/opencore-amr/code
ignore = dirty
[submodule "submodules/msamr"]
path = submodules/msamr
url = git://git.linphone.org/msamr.git

9
submodules/build/builders.d/opencore-amr.mk
View file

@ -22,10 +22,13 @@
opencore-amr_dir?=externals/opencore-amr
$(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure: $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure.ac
cd $(BUILDER_SRC_DIR)/$(opencore-amr_dir) && autoreconf
$(BUILDER_SRC_DIR)/$(opencore-amr_dir)/autoreconf.stamp: $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure.ac
cd $(BUILDER_SRC_DIR)/$(opencore-amr_dir) \
&& libtoolize --copy --force \
&& aclocal -I m4 \
&& automake --add-missing --force-missing --copy && autoreconf && touch autoreconf.stamp
$(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure
$(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/autoreconf.stamp
mkdir -p $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)
cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/ \
&& CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \

2
submodules/externals/srtp vendored

@ -1 +1 @@
Subproject commit ca0b6a3402fed819bbffd4375df7ded209c9d39f
Subproject commit 4338c102f5a4b8f89b7019ed66fb456e3e3359ae

2
submodules/linphone

@ -1 +1 @@
Subproject commit 3a9b9dd29c08147b5c2292c0e988f45840588070
Subproject commit 7e32b85fa2a1ffc80433974c4ea66910a53c246e