diff --git a/app/src/main/lib/mpg123/build.sh b/app/src/main/lib/mpg123/build.sh
deleted file mode 100644
index ea9280a..0000000
--- a/app/src/main/lib/mpg123/build.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-export TOOLCHAIN=/opt/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64
-export TARGET=armv7a-linux-androideabi
-export TARGET2=arm-linux-androideabi
-export API=21
-export AR=$TOOLCHAIN/bin/$TARGET2-ar
-export AS=$TOOLCHAIN/bin/$TARGET2-as
-export CC=$TOOLCHAIN/bin/$TARGET$API-clang
-export CXX=$TOOLCHAIN/bin/$TARGET$API-clang++
-export LD=$TOOLCHAIN/bin/$TARGET2-ld
-export RANLIB=$TOOLCHAIN/bin/$TARGET2-ranlib
-export STRIP=$TOOLCHAIN/bin/$TARGET2-strip
-
-export CFLAGS=-DNOXFERMEM
-./configure --host $TARGET --with-audio=dummy --with-cpu=arm_fpu --prefix=$(pwd)/install
-make
-make install
-
-# add NOXFERMEM ifdefs to buffer.c and xfermem.c
-# see https://android.googlesource.com/platform/external/mpg123/+/refs/heads/master/src/buffer.c
-
diff --git a/app/src/main/lib/mpg123/build_64.sh b/app/src/main/lib/mpg123/build_64.sh
deleted file mode 100644
index 8dfcd9d..0000000
--- a/app/src/main/lib/mpg123/build_64.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-export TOOLCHAIN2=/opt/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android
-export TOOLCHAIN=/opt/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64
-export TARGET=aarch64-linux-android
-export TARGET2=arm-linux-androideabi
-#export API=28
-export API=21
-export AR=$TOOLCHAIN2/bin/ar
-export AS=$TOOLCHAIN2/bin/as
-export CC=$TOOLCHAIN/bin/${TARGET}$API-clang
-export CXX=$TOOLCHAIN/bin/${TARGET}$API-clang++
-#export CC=$TOOLCHAIN/bin/${TARGET}26-clang
-#export CXX=$TOOLCHAIN/bin/${TARGET}28-clang++
-export LD=$TOOLCHAIN2/bin/ld
-export RANLIB=$TOOLCHAIN2/bin/ranlib
-export STRIP=$TOOLCHAIN2/bin/strip
-
-export CFLAGS="-DNOXFERMEM -fno-integrated-as"
-./configure --host $TARGET --with-audio=dummy --with-cpu=neon64 --prefix=$(pwd)/install_64
-make
-make install
-
-# add NOXFERMEM ifdefs to buffer.c and xfermem.c
-# see https://android.googlesource.com/platform/external/mpg123/+/refs/heads/master/src/buffer.c
-
diff --git a/app/src/main/lib/mpg123/build_arm.sh b/app/src/main/lib/mpg123/build_arm.sh
new file mode 100644
index 0000000..3f89ad2
--- /dev/null
+++ b/app/src/main/lib/mpg123/build_arm.sh
@@ -0,0 +1,23 @@
+#export TOOLCHAIN=/opt/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64
+export TOOLCHAIN=/c/Users/david/AppData/Local/Android/Sdk/ndk/26.1.10909125/toolchains/llvm/prebuilt/windows-x86_64
+export TARGET=armv7a-linux-androideabi
+#export TARGET=x86_64-linux-android
+export API=21
+export AR=$TOOLCHAIN/bin/llvm-ar
+export AS=$TOOLCHAIN/bin/llvm-as
+export CC=$TOOLCHAIN/bin/$TARGET$API-clang
+export CXX=$TOOLCHAIN/bin/$TARGET$API-clang++
+export LD=$TOOLCHAIN/bin/ld
+export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
+export STRIP=$TOOLCHAIN/bin/llvm-strip
+
+export CFLAGS=-DNOXFERMEM
+./configure --host $TARGET --with-audio=dummy --with-cpu=arm_fpu --prefix=$(pwd)/install
+make
+make install
+
+# add NOXFERMEM ifdefs to buffer.c and xfermem.c
+# see https://android.googlesource.com/platform/external/mpg123/+/refs/heads/master/src/buffer.c
+#
+
+# run 'make' with MSYS2, not Chocolatey make -> avoid 'C:/Program Files/' style SHELL
diff --git a/app/src/main/lib/mpg123/build_win.sh b/app/src/main/lib/mpg123/build_win.sh
index 6d40602..2638ebd 100644
--- a/app/src/main/lib/mpg123/build_win.sh
+++ b/app/src/main/lib/mpg123/build_win.sh
@@ -1,8 +1,10 @@
+#export TOOLCHAIN=/opt/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64
 export TOOLCHAIN=/c/Users/david/AppData/Local/Android/Sdk/ndk/26.1.10909125/toolchains/llvm/prebuilt/windows-x86_64
+#export TARGET=armv7a-linux-androideabi
+#export TARGET2=arm-linux-androideabi
 export TARGET=x86_64-linux-android
+#export TARGET2=x86_64-linux-android
 export API=21
-# run configure,make,make install  -- all from MSYS2
-
 export AR=$TOOLCHAIN/bin/llvm-ar
 export AS=$TOOLCHAIN/bin/llvm-as
 export CC=$TOOLCHAIN/bin/$TARGET$API-clang
@@ -11,13 +13,13 @@ export LD=$TOOLCHAIN/bin/ld
 export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
 export STRIP=$TOOLCHAIN/bin/llvm-strip
 
-
-
 export CFLAGS=-DNOXFERMEM
-./configure --host $TARGET --with-audio=dummy --prefix=$(pwd)/install
+#--with-cpu=arm_fpu
+./configure --host $TARGET --with-audio=dummy --prefix=$(pwd)/install-files
 make
 make install
 
 # add NOXFERMEM ifdefs to buffer.c and xfermem.c
 # see https://android.googlesource.com/platform/external/mpg123/+/refs/heads/master/src/buffer.c
 
+# run 'make' with MSYS2, not Chocolatey make -> avoid 'C:/Program Files/' style SHELL