From 1217a571263a515905a900f44245707794b7f29e Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Tue, 15 Oct 2013 09:27:13 +0200 Subject: [PATCH 1/2] Some commands for distclean in FFMPEG fail in OSX, so don't account on these. We simply remove the folder afterwards. --- submodules/build/builders.d/ffmpeg.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/submodules/build/builders.d/ffmpeg.mk b/submodules/build/builders.d/ffmpeg.mk index 025b2c0c3..e51fa0e78 100644 --- a/submodules/build/builders.d/ffmpeg.mk +++ b/submodules/build/builders.d/ffmpeg.mk @@ -43,10 +43,11 @@ build-ffmpeg: $(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/config.mak && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig make RANLIB="$$RANLIB" && make RANLIB="$$RANLIB" install clean-ffmpeg: - cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && make clean + -cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && make clean veryclean-ffmpeg: - cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && make distclean + -cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && make distclean + rm -rf $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) clean-makefile-ffmpeg: cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && rm -f config.mak From 7793c638e99dac7fb6a61db1e74511cde7b4b008 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Tue, 15 Oct 2013 10:40:32 +0200 Subject: [PATCH 2/2] Don't skip image optimization. --- ImageOptim.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ImageOptim.sh b/ImageOptim.sh index d67f4030b..6e054affa 100755 --- a/ImageOptim.sh +++ b/ImageOptim.sh @@ -18,8 +18,6 @@ for i in $CMDS; do command -v $i > /dev/null && continue || { echo "$i command not found"; exit 1; } done -exit 0 - DIR=${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH} PNGS=$(find $DIR -type f -name *.png)