summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rwxr-xr-xtools/osx_packaging/osx_build2
-rwxr-xr-xtools/x-win/compile.sh3
-rwxr-xr-xtools/x-win/package.sh1
3 files changed, 4 insertions, 2 deletions
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index f890cfe971..df6a2864a7 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -472,7 +472,7 @@ while [ true ] ; do
strip -u -r -arch all $file &>/dev/null
fi
- deps=`otool -L $file | awk '{print $1}' | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | grep -v 'libjack\.' | grep -v "$(basename $file)"`
+ deps=`otool -L $file | awk '{print $1}' | egrep "($GTKSTACK_ROOT|$ARDOURSTACK_ROOT|/opt/|/local/|libs/$STDCPP)" | grep -v 'libjack\.' | egrep -v "$(basename $file .dylib).*.dylib"`
# echo -n "."
for dep in $deps ; do
base=`basename $dep`
diff --git a/tools/x-win/compile.sh b/tools/x-win/compile.sh
index 6f8e141685..00fe2737e2 100755
--- a/tools/x-win/compile.sh
+++ b/tools/x-win/compile.sh
@@ -81,7 +81,8 @@ DEPSTACK_ROOT="$PREFIX" \
--dist-target=mingw \
--also-include=${PREFIX}/include \
$ARDOURCFG \
- --prefix=${PREFIX}
+ --prefix=${PREFIX} \
+ --libdir=${PREFIX}/lib
./waf ${CONCURRENCY}
diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index 3dbfa6c248..dfbea0978a 100755
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -202,6 +202,7 @@ cp gtk2_ardour/icons/cursor_square/* $DESTDIR/share/${LOWERCASE_DIRNAME}/icons/
# clean build-dir after depoyment
echo " === bundle completed, cleaning up"
./waf uninstall
+find $DESTDIR -name "*.dll.a" | xargs rm
echo " === complete"
du -sh $DESTDIR