diff --git a/.gitmodules b/.gitmodules index 9db29456b..2119266b8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,9 +58,6 @@ [submodule "submodules/externals/libxml2"] path = submodules/externals/libxml2 url = git://git.gnome.org/libxml2 -[submodule "submodules/msisac"] - path = submodules/msisac - url = git://git.linphone.org/msisac [submodule "submodules/cunit"] path = submodules/cunit url = git://git.linphone.org/cunit.git @@ -70,3 +67,6 @@ [submodule "submodules/msopenh264"] path = submodules/msopenh264 url = git://git.linphone.org/msopenh264.git +[submodule "submodules/mswebrtc"] + path = submodules/mswebrtc + url = git://git.linphone.org/mswebrtc.git diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index ff553edea..1999059ba 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -55,7 +55,7 @@ endif LINPHONE_SRC_DIR=$(BUILDER_SRC_DIR)/linphone LINPHONE_BUILD_DIR=$(BUILDER_BUILD_DIR)/linphone -all: build-linphone build-msilbc build-msamr build-msx264 build-mssilk build-msbcg729 build-msisac build-msopenh264 +all: build-linphone build-msilbc build-msamr build-msx264 build-mssilk build-msbcg729 build-mswebrtc build-msopenh264 # setup the switches that might trigger a linphone reconfiguration @@ -141,7 +141,7 @@ veryclean: veryclean-linphone veryclean-msbcg729 rm -rf $(BUILDER_BUILD_DIR) # list of the submodules to build, the order is important -MS_MODULES := msilbc libilbc msamr mssilk msx264 msisac msopenh264 +MS_MODULES := msilbc libilbc msamr mssilk msx264 mswebrtc msopenh264 SUBMODULES_LIST := polarssl ifeq ($(enable_tunnel),yes) diff --git a/submodules/build/builders.d/msisac.mk b/submodules/build/builders.d/mswebrtc.mk similarity index 53% rename from submodules/build/builders.d/msisac.mk rename to submodules/build/builders.d/mswebrtc.mk index 8b00df863..9bf7450f7 100644 --- a/submodules/build/builders.d/msisac.mk +++ b/submodules/build/builders.d/mswebrtc.mk @@ -1,5 +1,5 @@ ############################################################################ -# msisac.mk +# mswebrtc.mk # Copyright (C) 2014 Belledonne Communications,Grenoble France # ############################################################################ @@ -19,28 +19,28 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # ############################################################################ -msisac_dir?=msisac +mswebrtc_dir?=mswebrtc -$(BUILDER_SRC_DIR)/$(msisac_dir)/configure: - cd $(BUILDER_SRC_DIR)/$(msisac_dir) && ./autogen.sh +$(BUILDER_SRC_DIR)/$(mswebrtc_dir)/configure: + cd $(BUILDER_SRC_DIR)/$(mswebrtc_dir) && ./autogen.sh -$(BUILDER_BUILD_DIR)/$(msisac_dir)/Makefile: $(BUILDER_SRC_DIR)/$(msisac_dir)/configure - mkdir -p $(BUILDER_BUILD_DIR)/$(msisac_dir) - cd $(BUILDER_BUILD_DIR)/$(msisac_dir)/ \ +$(BUILDER_BUILD_DIR)/$(mswebrtc_dir)/Makefile: $(BUILDER_SRC_DIR)/$(mswebrtc_dir)/configure + mkdir -p $(BUILDER_BUILD_DIR)/$(mswebrtc_dir) + cd $(BUILDER_BUILD_DIR)/$(mswebrtc_dir)/ \ && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ - $(BUILDER_SRC_DIR)/$(msisac_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} CFLAGS="-Wno-error" + $(BUILDER_SRC_DIR)/$(mswebrtc_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} --disable-aec CFLAGS="-Wno-error" -build-msisac: $(BUILDER_BUILD_DIR)/$(msisac_dir)/Makefile - cd $(BUILDER_BUILD_DIR)/$(msisac_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install +build-mswebrtc: $(BUILDER_BUILD_DIR)/$(mswebrtc_dir)/Makefile + cd $(BUILDER_BUILD_DIR)/$(mswebrtc_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install -clean-msisac: - cd $(BUILDER_BUILD_DIR)/$(msisac_dir) && make clean +clean-mswebrtc: + cd $(BUILDER_BUILD_DIR)/$(mswebrtc_dir) && make clean -veryclean-msisac: - -cd $(BUILDER_BUILD_DIR)/$(msisac_dir) && make distclean - -cd $(BUILDER_SRC_DIR)/$(msisac_dir) && rm -f configure +veryclean-mswebrtc: + -cd $(BUILDER_BUILD_DIR)/$(mswebrtc_dir) && make distclean + -cd $(BUILDER_SRC_DIR)/$(mswebrtc_dir) && rm -f configure -clean-makefile-msisac: - cd $(BUILDER_BUILD_DIR)/$(msisac_dir) && rm -f Makefile +clean-makefile-mswebrtc: + cd $(BUILDER_BUILD_DIR)/$(mswebrtc_dir) && rm -f Makefile diff --git a/submodules/msisac b/submodules/msisac deleted file mode 160000 index fafe68323..000000000 --- a/submodules/msisac +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fafe68323df68b5f4e18b15b350134a54888f2b4 diff --git a/submodules/mswebrtc b/submodules/mswebrtc new file mode 160000 index 000000000..0c9d65c32 --- /dev/null +++ b/submodules/mswebrtc @@ -0,0 +1 @@ +Subproject commit 0c9d65c32431969e58f77e0c280d7ce601ca043b