Merge branch 'dev_videoios' of git.linphone.org:linphone-iphone-choochee into dev_videoios

This commit is contained in:
Jehan Monnier 2011-10-26 21:31:48 +02:00
commit 164352abe7
2 changed files with 2 additions and 1 deletions

1
README
View file

@ -9,6 +9,7 @@ Linphone for iPhone depends on liblinphone sdk. To build this sdk, you must inst
-wget
-pkgconfig
-cmake (for ZRTP support)
-yasm
gas-preprosessor.pl (http://github.com/yuvi/gas-preprocessor/ ) to be copied into /opt/local/bin

View file

@ -55,7 +55,7 @@ $(BUILDER_BUILD_DIR)/$(x264_dir)/config.mak: $(BUILDER_BUILD_DIR)/$(x264_dir)/co
&& ./configure --prefix=$(prefix) ${x264-configure-option}
build-x264: $(BUILDER_BUILD_DIR)/$(x264_dir)/config.mak
cd $(BUILDER_BUILD_DIR)/$(x264_dir) make && make install
cd $(BUILDER_BUILD_DIR)/$(x264_dir) make && make install-lib-static
clean-x264:
cd $(BUILDER_BUILD_DIR)/$(x264_dir) && make clean