Mercurial > hg > vamp-build-and-test
diff SCRIPTS/process.sh @ 21:ee6b7d71155b
Some os/x build fixes
author | Chris Cannam |
---|---|
date | Tue, 05 Aug 2014 12:55:55 +0100 |
parents | b7f35acc8561 |
children | 5b4cb5af2a90 |
line wrap: on
line diff
--- a/SCRIPTS/process.sh Tue Aug 05 12:20:30 2014 +0100 +++ b/SCRIPTS/process.sh Tue Aug 05 12:55:55 2014 +0100 @@ -18,13 +18,23 @@ #pluginext=.so #hostwrapper="" #hostext="" +#archflags= -platform=mingw -bits=32 -toolprefix=i686-w64-mingw32- -pluginext=.dll -hostwrapper=wine -hostext=.exe +#platform=mingw +#bits=32 +#toolprefix=i686-w64-mingw32- +#pluginext=.dll +#hostwrapper=wine +#hostext=.exe +#archflags= + +platform=osx +bits=64 +toolprefix= +pluginext=.dylib +hostwrapper= +hostext= +archflags="-arch x86_64" depincdir="$mydir"/../DEPENDENCIES/$platform$bits/include deplibdir="$mydir"/../DEPENDENCIES/$platform$bits/lib @@ -96,7 +106,9 @@ if [ -n "$mfile" ]; then target=$(target_for "$dir") TOOLPREFIX="$toolprefix" \ - CXXFLAGS="-I${depincdir} -I${depincdir_generic} -I../vamp-plugin-sdk" LDFLAGS="-L${deplibdir} -L../vamp-plugin-sdk" \ + CXXFLAGS="-I${depincdir} -I${depincdir_generic} -I../vamp-plugin-sdk" \ + LDFLAGS="-L${deplibdir} -L../vamp-plugin-sdk" \ + ARCHFLAGS="$archflags" \ make -C "$dir" -f "$mfile" $target 2>&1 | \ tee "$reportdir/$dir.build.txt" return ${PIPESTATUS[0]} @@ -198,12 +210,12 @@ fi } -if ! build "vamp-plugin-sdk"; then +if ! rebuild "vamp-plugin-sdk"; then echo "Failed to build Vamp plugin SDK!" exit 1 fi -if ! build "vamp-plugin-tester"; then +if ! rebuild "vamp-plugin-tester"; then echo "Failed to build Vamp plugin tester!" exit 1 fi @@ -211,7 +223,7 @@ for dir in $plugindirs ; do echo echo "Processing: $dir" - if build "$dir"; then + if rebuild "$dir"; then if have_plugin "$dir" ; then echo "$dir" >> "$built" run_tester "$dir"