# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1683717572 -10800
# Node ID 02d2dec01f0fcb38e3c59beb48b005a57f093676
# Parent  1450e45473a562f4dae561d88feeb0b908796605
Fixes to the win32 build script.

diff -r 1450e45473a5 -r 02d2dec01f0f build-win32.sh
--- a/build-win32.sh	Tue May 09 15:32:07 2023 +0300
+++ b/build-win32.sh	Wed May 10 14:19:32 2023 +0300
@@ -3,14 +3,12 @@
 INSTALL_WINE="$HOME/.wine/drive_c/Syntilista/"
 TMPFILE="unix2dos.tmp"
 
-BUILDPATH="win32/"
+MINGW_CPP="i686-w64-mingw32-g++"
+BINPATH="win32/"
 
 QT_VERSION_PREFIX="Qt5"
-QT_PREFIX="/misc/packages/qt5-src"
-QT_BASE="${QT_PREFIX}/qtbase"
+QT_BASE="/misc/packages/qt5-src/qtbase"
 
-MINGWPATH="$(dirname $(i686-w64-mingw32-g++ -print-prog-name=cc1))"
-MINGWLIBS="/usr/i686-w64-mingw32/lib/"
 
 
 fatal()
@@ -67,23 +65,30 @@
     done
 
     for i in libstdc++-6 libgcc_s_sjlj-1; do
-        do_cp "${MINGWPATH}/${i}.dll" "$TARGET"
+        do_cp "${MINGW_PATH}/${i}.dll" "$TARGET"
         strip "${TARGET}/${i}.dll"
     done
 
     for i in zlib1.dll; do
-        do_cp "${MINGWLIBS}/${i}" "$TARGET"
+        do_cp "${MINGW_LIBS}/${i}" "$TARGET"
     done
 
-    do_cp "$BUILDPATH/Syntilista.exe" "$TARGET"
+    do_cp "$BINPATH/Syntilista.exe" "$TARGET"
     unix2dos -n "COPYING.html" "$TMPFILE" || fatal "Could not unix2dos."
     do_cp "$TMPFILE" "$TARGET/COPYING.txt"
     rm -f "$TMPFILE"
 }
 
 
+### Check dirs
+MINGW_PATH="$(dirname $(realpath $($MINGW_CPP -print-prog-name=cc1)))"
+MINGW_LIBS="$(dirname $(realpath $($MINGW_CPP -print-file-name=zlib1.dll)))"
+test -d "$MINGW_PATH" || fatal "Could not find MinGW C++ compiler path!"
+test -d "$MINGW_LIBS" || fatal "Could not find MinGW library path (zlib1.dll not found)"
+
 ### Build the binaries
-make -f Makefile.cross-mingw QT_PREFIX="$QT_PREFIX" BINPATH="$BUILDPATH"
+echo "QT: ${QT_BASE} / MinGW: ${MINGW_PATH}"
+make -f Makefile.cross-mingw QT_PREFIX="$QT_BASE" BINPATH="$BINPATH" || fatal "Compilation failed."
 
 ### Install to targets
 if test -d "$INSTALL_USB" && mount|grep -q "$INSTALL_USB"; then
@@ -91,4 +96,4 @@
 else
     echo "INFO: '$INSTALL_USB' is not mounted. Not installing."
 fi
-do_install "$INSTALL_WINE"
+#do_install "$INSTALL_WINE"