Mercurial > hg > vamp-build-and-test
changeset 15:663ca0da4350
Some mingw32 fixes
| author | Chris Cannam |
|---|---|
| date | Mon, 04 Aug 2014 21:37:03 +0100 |
| parents | 114c03877f21 |
| children | 2665513ce2d3 |
| files | .hgsubstate SCRIPTS/process.sh |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Mon Aug 04 18:23:19 2014 +0100 +++ b/.hgsubstate Mon Aug 04 21:37:03 2014 +0100 @@ -8,7 +8,7 @@ b835875739968beb870e7e09132aa361656a8a30 vamp-aubio-plugins 32407651025d8334f4d1f93dedbcd492b24bd93a vamp-libxtract-plugins 717aa5a28254817c48be2450af49b9b84c61c91e vamp-onsetsds-plugin -0ca8e104e8b10db63ca3e7d75927fa9c10232bae vamp-plugin-sdk +ff78d47310af75524cf4d087c1a5861d0fa01afc vamp-plugin-sdk 0973204bf4469449d6870890734d23996166748c vamp-plugin-tester 886d1071c282201f67504690ea6476417193db18 vamp-test-plugin 4ffac7dedddfbbdffc18f74a71c05e8e0f88bd67 vampy
--- a/SCRIPTS/process.sh Mon Aug 04 18:23:19 2014 +0100 +++ b/SCRIPTS/process.sh Mon Aug 04 21:37:03 2014 +0100 @@ -13,11 +13,14 @@ #bits=64 mydir=$(dirname "$0") +case "$mydir" in /*);; *) mydir=$(pwd)/"$mydir";; esac platform=mingw bits=32 toolprefix=i686-w64-mingw32- -depincdir=$(mydir)/DEPENDENCIES/win32-mingw/include + +depincdir="$mydir"/../DEPENDENCIES/win32-mingw/include +deplibdir="$mydir"/../DEPENDENCIES/win32-mingw/lib plugindirs="$@" if [ -z "$plugindirs" ]; then @@ -71,7 +74,7 @@ if configure_maybe "$dir"; then mfile=$(find_makefile "$dir") if [ -n "$mfile" ]; then - make -C "$dir" -f "$mfile" TOOLPREFIX="$toolprefix" CXXFLAGS="-I$depincdir" 2>&1 | tee "$reportdir/$dir.build.txt" + TOOLPREFIX="$toolprefix" CXXFLAGS="-I$depincdir" LDFLAGS="-L$deplibdir" make -C "$dir" -f "$mfile" 2>&1 | tee "$reportdir/$dir.build.txt" return ${PIPESTATUS[0]} else echo "Failed to find a Makefile in $dir" @@ -86,7 +89,7 @@ mfile=$(find_makefile "$dir") if [ -n "$mfile" ]; then make -C "$dir" -f "$mfile" clean - make -C "$dir" -f "$mfile" TOOLPREFIX="$toolprefix" 2>&1 | tee "$reportdir/$dir.build.txt" + TOOLPREFIX="$toolprefix" CXXFLAGS="-I$depincdir" LDFLAGS="-L$deplibdir" make -C "$dir" -f "$mfile" 2>&1 | tee "$reportdir/$dir.build.txt" return ${PIPESTATUS[0]} else echo "Failed to find a Makefile in $dir" @@ -145,7 +148,7 @@ done } -if ! rebuild "vamp-plugin-sdk"; then +if ! build "vamp-plugin-sdk"; then echo "Failed to build Vamp plugin SDK!" exit 1 fi