aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2020-09-05 19:30:03 -0700
committerH. Peter Anvin <hpa@zytor.com>2020-09-05 19:30:43 -0700
commitbff4d3a69b7677fd06f9736e417760e916509514 (patch)
tree1e44d8f6c488914a88b141d645d987a9357901fe
parentd5a3cd7881725c1cdbe65c1d990ac00efa694d67 (diff)
downloadabcdisk-bff4d3a69b7677fd06f9736e417760e916509514.tar.gz
abcdisk-bff4d3a69b7677fd06f9736e417760e916509514.tar.xz
abcdisk-bff4d3a69b7677fd06f9736e417760e916509514.zip
mkrel: handle libsndfile-1.dll on Windows
-rwxr-xr-xmkrel11
1 files changed, 7 insertions, 4 deletions
diff --git a/mkrel b/mkrel
index 908a968..db2d551 100755
--- a/mkrel
+++ b/mkrel
@@ -2,6 +2,7 @@
project=abcdisk
windll=''
+winlib="$HOME/winlib"
pv="$(git describe --abbrev=4)"
@@ -26,9 +27,10 @@ for target in x86_64-w64-mingw32; do
mkdir "$target"
cd "$target"
dlldir="/usr/$target/sys-root/mingw/bin"
+ libsndfile="$winlib/$target/libsndfile"
tar xfz ../"$pv".tar.gz
cd "$pv"
- ./configure --host="$target"
+ ./configure --host="$target" --with-libsndfile="$libsndfile"
make clean
make -j
cd ..
@@ -39,14 +41,15 @@ for target in x86_64-w64-mingw32; do
todos < "$f" > "$pv"/"$(basename "$f")"
done
for d in $windll; do
- cp "$dlldir"/"$d" "$pv"/
+ cp -l "$dlldir"/"$d" "$pv"/
done
+ cp -l "$libsndfile"/*/libsndfile*.dll "$pv"/
zip -9r -o "$pv".zip "$pv"
cd ..
done
(
set +xe
-rm -f "$pv"-win64.zip ; ln x86_64-w64-mingw32/"$pv".zip "$pv"-win64.zip
-rm -f "$pv"-win32.zip ; ln i686-w64-mingw32/"$pv".zip "$pv"-win32.zip
+ln x86_64-w64-mingw32/"$pv".zip "$pv"-win64.zip
+ln i686-w64-mingw32/"$pv".zip "$pv"-win32.zip
) 2>/dev/null