diff --git a/.gitmodules b/.gitmodules index 376e5dfa6..5a5396802 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,3 +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 diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index dfc86c0f6..8d649f120 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -63,7 +63,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 +all: build-linphone build-msilbc build-msamr build-msx264 build-mssilk build-msbcg729 build-msisac # setup the switches that might trigger a linphone reconfiguration @@ -131,7 +131,7 @@ veryclean: veryclean-linphone veryclean-msbcg729 rm -rf $(BUILDER_BUILD_DIR) # list of the submodules to build -MS_MODULES := msilbc libilbc msamr mssilk msx264 +MS_MODULES := msilbc libilbc msamr mssilk msx264 msisac SUBMODULES_LIST := polarssl libantlr belle-sip srtp zrtpcpp speex libgsm libvpx libxml2 ffmpeg opus .NOTPARALLEL build-linphone: init $(addprefix build-,$(SUBMODULES_LIST)) mode_switch_check $(LINPHONE_BUILD_DIR)/Makefile diff --git a/submodules/build/builders.d/msisac.mk b/submodules/build/builders.d/msisac.mk new file mode 100644 index 000000000..d6dcd61c7 --- /dev/null +++ b/submodules/build/builders.d/msisac.mk @@ -0,0 +1,43 @@ +############################################################################ +# msisac.mk +# Copyright (C) 2014 Belledonne Communications,Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################ +msisac_dir?=msisac +$(BUILDER_SRC_DIR)/$(msisac_dir)/configure: + cd $(BUILDER_SRC_DIR)/$(msisac_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)/ \ + && 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} + +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 + +clean-msisac: + cd $(BUILDER_BUILD_DIR)/$(msisac_dir) && make clean + +veryclean-msisac: + -cd $(BUILDER_BUILD_DIR)/$(msisac_dir) && make distclean + -cd $(BUILDER_SRC_DIR)/$(msisac_dir) && rm -f configure + +clean-makefile-msisac: + cd $(BUILDER_BUILD_DIR)/$(msisac_dir) && rm -f Makefile diff --git a/submodules/msisac b/submodules/msisac new file mode 160000 index 000000000..e65bcdff6 --- /dev/null +++ b/submodules/msisac @@ -0,0 +1 @@ +Subproject commit e65bcdff6866d45d0cda6c36a9414a97ad6e917d