remove armv6 build

This commit is contained in:
Jehan Monnier 2012-09-20 18:12:52 +02:00
parent d2e2b34ca3
commit 286efef8ae
5 changed files with 30 additions and 29 deletions

10
README
View file

@ -10,9 +10,9 @@ You must first install both xcode with iPhone OS SDK and MacPorts (www.macports.
Make sure that /opt/local/bin (macport tools) arrives first in your PATH env variable, so that the macport tools are taken in place of the versions brought by Apple in /usr/bin. Otherwise the build will fail with obscure errors. Make sure that /opt/local/bin (macport tools) arrives first in your PATH env variable, so that the macport tools are taken in place of the versions brought by Apple in /usr/bin. Otherwise the build will fail with obscure errors.
Once xccode and macports are installed, open a terminal and install the required build-time tools with: Once xcode and macports are installed, open a terminal and install the required build-time tools with:
$ sudo port install coreutils automake autoconf libtool intltool wget pkgconfig cmake gmake yasm grep doxygen $ sudo port install coreutils automake autoconf libtool intltool wget pkgconfig cmake gmake yasm grep doxygen ImageMagick optipng
Install gas-preprosessor.pl (http://github.com/yuvi/gas-preprocessor/ ) to be copied into /opt/local/bin : Install gas-preprosessor.pl (http://github.com/yuvi/gas-preprocessor/ ) to be copied into /opt/local/bin :
@ -32,8 +32,6 @@ Link host's strings to simulator SDK
For newer XCode: For newer XCode:
$ sudo ln -s /usr/bin/strings /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/strings $ sudo ln -s /usr/bin/strings /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/strings
ImageMagick & Optipng
sudo port install ImageMagick optipng
BUILDING THE SDK BUILDING THE SDK
**************** ****************
@ -54,8 +52,8 @@ BUILDING THE SDK
$ cd submodules/build $ cd submodules/build
$ make all enable_gpl_third_parties=no $ make all enable_gpl_third_parties=no
xcode 4.5i/ios6 beta do: xcode prior to 4.5:
$ make -f Makefile.ios6-beta $ make -f Makefile.xcode4.4
* ZRTP support * ZRTP support
You can enable ZRTP support in GPL mode only, by adding "enable_zrtp=yes" to the make command, for example: You can enable ZRTP support in GPL mode only, by adding "enable_zrtp=yes" to the make command, for example:

View file

@ -54,28 +54,28 @@ endif
LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp)
build: build:
make -f builder-iphone-os.mk host=armv6-apple-darwin $(LINPHONE_OPTIONS) all \ make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \
&& make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) all \
&& make -f builder-iphone-os.mk host=armv7-apple-darwin $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-os.mk host=armv7s-apple-darwin $(LINPHONE_OPTIONS) all \
&& make -f builder-iphone-os.mk delivery-sdk && make -f builder-iphone-os.mk delivery-sdk
ipa: build ipa: build
make -f builder-iphone-simulator.mk ipa \ make -f builder-iphone-simulator.mk ipa \
&& make -f builder-iphone-os.mk host=armv6-apple-darwin ipa \ && make -f builder-iphone-os.mk ipa \
&& make -f builder-iphone-os.mk host=armv7-apple-darwin ipa && make -f builder-iphone-os.mk host=armv7s-apple-darwin ipa \
clean: clean:
make -f builder-iphone-simulator.mk clean \ make -f builder-iphone-simulator.mk clean \
&& make -f builder-iphone-os.mk host=armv6-apple-darwin clean \ && make -f builder-iphone-os.mk clean \
&& make -f builder-iphone-os.mk host=armv7-apple-darwin clean && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean \
clean-makefile: clean-makefile:
make -f builder-iphone-simulator.mk clean-makefile \ make -f builder-iphone-simulator.mk clean-makefile \
&& make -f builder-iphone-os.mk host=armv6-apple-darwin clean-makefile \ && make -f builder-iphone-os.mk clean-makefile \
&& make -f builder-iphone-os.mk host=armv7-apple-darwin clean-makefile && make -f builder-iphone-os.mk host=armv7s-apple-darwin clean-makefile \
veryclean: veryclean:
make -f builder-iphone-simulator.mk veryclean \ make -f builder-iphone-simulator.mk veryclean \
&& make -f builder-iphone-os.mk host=armv6-apple-darwin veryclean \ && make -f builder-iphone-os.mk veryclean \
&& make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean && make -f builder-iphone-os.mk host=armv7s-apple-darwin veryclean \

View file

@ -54,28 +54,28 @@ endif
LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp)
build: build:
make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ make -f builder-iphone-os.mk host=armv6-apple-darwin $(LINPHONE_OPTIONS) all \
&& make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \
&& make -f builder-iphone-os.mk host=armv7s-apple-darwin $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-os.mk host=armv7-apple-darwin $(LINPHONE_OPTIONS) all \
&& make -f builder-iphone-os.mk delivery-sdk && make -f builder-iphone-os.mk delivery-sdk
ipa: build ipa: build
make -f builder-iphone-simulator.mk ipa \ make -f builder-iphone-simulator.mk ipa \
&& make -f builder-iphone-os.mk ipa \ && make -f builder-iphone-os.mk host=armv6-apple-darwin ipa \
&& make -f builder-iphone-os.mk host=armv7s-apple-darwin ipa \ && make -f builder-iphone-os.mk host=armv7-apple-darwin ipa
clean: clean:
make -f builder-iphone-simulator.mk clean \ make -f builder-iphone-simulator.mk clean \
&& make -f builder-iphone-os.mk clean \ && make -f builder-iphone-os.mk host=armv6-apple-darwin clean \
&& make -f builder-iphone-os.mk host=armv7s-apple-darwin clean \ && make -f builder-iphone-os.mk host=armv7-apple-darwin clean
clean-makefile: clean-makefile:
make -f builder-iphone-simulator.mk 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=armv6-apple-darwin clean-makefile \
&& make -f builder-iphone-os.mk host=armv7s-apple-darwin clean-makefile \ && make -f builder-iphone-os.mk host=armv7-apple-darwin clean-makefile
veryclean: veryclean:
make -f builder-iphone-simulator.mk veryclean \ make -f builder-iphone-simulator.mk veryclean \
&& make -f builder-iphone-os.mk veryclean \ && make -f builder-iphone-os.mk host=armv6-apple-darwin veryclean \
&& make -f builder-iphone-os.mk host=armv7s-apple-darwin veryclean \ && make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean

View file

@ -115,7 +115,7 @@ veryclean: veryclean-linphone veryclean-msbcg729
clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264
cd $(LINPHONE_BUILD_DIR) && make clean cd $(LINPHONE_BUILD_DIR) && make clean
veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx
#-cd $(LINPHONE_BUILD_DIR) && make distclean #-cd $(LINPHONE_BUILD_DIR) && make distclean
-cd $(LINPHONE_SRC_DIR) && rm -f configure -cd $(LINPHONE_SRC_DIR) && rm -f configure

View file

@ -34,6 +34,9 @@ clean-libvpx:
veryclean-libvpx: veryclean-libvpx:
-cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make distclean -cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make distclean
cd $(BUILDER_SRC_DIR)/$(libvpx_dir) \
&& git checkout build/make/configure.sh configure\
&& rm -f patched.stamp
rm -rf $(BUILDER_BUILD_DIR)/$(libvpx_dir) rm -rf $(BUILDER_BUILD_DIR)/$(libvpx_dir)
clean-makefile-libvpx: clean-makefile-libvpx: