diff --git a/README b/README index f0e58f4d9..f8bf14208 100644 --- a/README +++ b/README @@ -15,7 +15,9 @@ You may update variable SDK_VERSION from file submodules/build/iphone-config.sit To generate the liblinphone dual arch sdk, once the above commands have been executed: cd submodules/build - make -f builder-iphone-simulator.mk all && make -f builder-iphone-os.mk all &&make -f builder-iphone-os.mk delivery-sdk + make all + +In case you upgrade your IOS SDK, you may force configure by using make targets and Libraries are available from liblinphone-sdk/ diff --git a/submodules/build/Makefile b/submodules/build/Makefile new file mode 100644 index 000000000..0b6b48f02 --- /dev/null +++ b/submodules/build/Makefile @@ -0,0 +1,34 @@ +############################################################################ +# Makefile +# Copyright (C) 2009 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. +# +############################################################################ +all: + make -f builder-iphone-simulator.mk all \ + && make -f builder-iphone-os.mk all \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin all \ + && make -f builder-iphone-os.mk delivery-sdk +clean: + make -f builder-iphone-simulator.mk clean \ + && make -f builder-iphone-os.mk clean \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin clean +clean-makefile: + make -f builder-iphone-simulator.mk clean-makefile \ + && make -f builder-iphone-os.mk clean-makefile \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin clean-makefile diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index ff42435e6..380d77b67 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -78,17 +78,17 @@ init: veryclean: rm -rf $(BUILDER_BUILD_DIR) -build-linphone: init build-openssl build-osip2 build-eXosip2 build-speex build-libgsm $(LINPHONE_BUILD_DIR)/Makefile +.NOTPARALLEL build-linphone: init build-openssl build-osip2 build-eXosip2 build-speex build-libgsm $(LINPHONE_BUILD_DIR)/Makefile cd $(LINPHONE_BUILD_DIR) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install -clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-msilbc clean-libilbc +clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-msilbc clean-libilbc clean-openssl cd $(LINPHONE_BUILD_DIR) && make clean -veryclean-linphone: clean-linphone veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-libgsm veryclean-msilbc veryclean-libilbc +veryclean-linphone: clean-linphone veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl cd $(LINPHONE_BUILD_DIR) && make distclean cd $(LINPHONE_SRC_DIR) && rm -f configure -clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-libilbc clean-makefile-msilbc +clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile @@ -182,7 +182,7 @@ veryclean-speex: cd $(BUILDER_BUILD_DIR)/$(speex_dir) && make distclean clean-makefile-speex: - cd $(BUILDER_SRC_DIR)/$(speex_dir) && rm -f Makefile + cd $(BUILDER_BUILD_DIR)/$(speex_dir) && rm -f Makefile #GSM @@ -220,14 +220,14 @@ build-msilbc: build-libilbc $(MSILBC_BUILD_DIR)/Makefile cd $(MSILBC_BUILD_DIR) && make && make install clean-msilbc: - cd $(MSILBC_BUILD_DIR) && make -f clean + cd $(MSILBC_BUILD_DIR) && make clean veryclean-msilbc: cd $(MSILBC_BUILD_DIR) && make distclean - cd $(MSILBC_SRC_DIR) && rm configure + cd $(MSILBC_BUILD_DIR) && rm configure clean-makefile-msilbc: - cd $(MSILBC_SRC_DIR) && rm -f Makefile + cd $(MSILBC_BUILD_DIR) && rm -f Makefile # libilbc @@ -248,7 +248,7 @@ clean-libilbc: veryclean-libilbc: cd $(LIBILBC_BUILD_DIR) && make distclean - cd $(LIBILBC_SRC_DIR) && rm -f configure + cd $(LIBILBC_BUILD_DIR) && rm -f configure clean-makefile-libilbc: cd $(LIBILBC_BUILD_DIR) && rm -f Makefile @@ -264,11 +264,12 @@ multi-arch: cp -rf $(prefix)/share $(prefix)/../apple-darwin/. ; \ for archive in $$arm_archives ; do \ i386_path=`echo $$archive | sed -e "s/armv6/i386/"` ;\ + armv7_path=`echo $$archive | sed -e "s/armv6/armv7/"` ;\ destpath=`echo $$archive | sed -e "s/armv6-//"` ;\ if test -f "$$i386_path"; then \ echo "Mixing $$archive and $$i386_path into $$destpath"; \ mkdir -p `dirname $$destpath` ; \ - lipo -create $$archive $$i386_path -output $$destpath; \ + lipo -create $$archive $$armv7_path $$i386_path -output $$destpath; \ else \ echo "WARNING: archive `basename $$archive` exists in arm tree but does not exists in i386 tree."; \ fi \ diff --git a/submodules/build/builders.d/openssl.mk b/submodules/build/builders.d/openssl.mk index d7c76cfc7..54a2b517e 100644 --- a/submodules/build/builders.d/openssl.mk +++ b/submodules/build/builders.d/openssl.mk @@ -30,6 +30,9 @@ build-openssl: $(OPENSSL_BUILD_DIR)/Makefile clean-openssl: cd $(OPENSSL_BUILD_DIR) && make clean +clean-makefile-openssl: + touch $(OPENSSL_BUILD_DIR)/Configure + veryclean-openssl: rm -rf $(OPENSSL_BUILD_DIR) diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index 1eef5cce9..6b156a5fe 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -10,6 +10,9 @@ if test "${host_alias}" = "i386-apple-darwin" ; then elif test "${host_alias}" = "armv6-apple-darwin" ; then ARCH=armv6 PLATFORM=OS +elif test "${host_alias}" = "armv7-apple-darwin" ; then + ARCH=armv7 + PLATFORM=OS else echo "bad host ${host_alias} must be either i386-apple-darwin or armv6-apple-darwin" exit