From ba58ef7d3a5fb059f8429f3c5c217b915cf5b88c Mon Sep 17 00:00:00 2001 From: Alexander Kojevnikov Date: Fri, 13 Sep 2013 10:21:34 -0700 Subject: [PATCH] osx: Run `make check` when bundling --- dist/osx/README.md | 5 +++-- dist/osx/bundle.sh | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dist/osx/README.md b/dist/osx/README.md index 8de862c..df6eb0b 100644 --- a/dist/osx/README.md +++ b/dist/osx/README.md @@ -2,7 +2,7 @@ Using [MacPorts](http://www.macports.org/) install build dependencies: - port install autoconf automake gcc47 git-core intltool upx yasm. + port install autoconf automake gcc48 git-core intltool upx yasm Download and build wxWidgets 2.9+, example configure flags: @@ -24,7 +24,8 @@ Download and build libopus, example configure flags: Download and build FFmpeg, example configure flags: - ./configure --prefix=$HOME/usr --enable-gpl --enable-version3 \ + PKG_CONFIG_PATH=$HOME/usr/lib/pkgconfig ./configure \ + --prefix=$HOME/usr --enable-gpl --enable-version3 \ --enable-runtime-cpudetect --enable-pthreads \ --disable-shared --disable-debug --disable-doc \ --disable-nonfree --disable-programs --disable-avdevice \ diff --git a/dist/osx/bundle.sh b/dist/osx/bundle.sh index e924483..cd779e1 100755 --- a/dist/osx/bundle.sh +++ b/dist/osx/bundle.sh @@ -7,9 +7,9 @@ cd $(dirname $0)/../.. rm -f src/spek -PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig CXX=/opt/local/bin/g++-mp-4.7 \ +PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig CXX=/opt/local/bin/g++-mp-4.8 \ ./autogen.sh --with-wx-config=$INSTALL_PATH/bin/wx-config \ - && make || exit 1 + && make && make check || exit 1 strip src/spek upx src/spek