diff build-win32.sh @ 50:402446a76794

And more build system work.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 07 Apr 2017 06:04:07 +0300
parents 179e7df4dc80
children 423d2383a605
line wrap: on
line diff
--- a/build-win32.sh	Fri Apr 07 05:40:22 2017 +0300
+++ b/build-win32.sh	Fri Apr 07 06:04:07 2017 +0300
@@ -3,9 +3,8 @@
 INSTALL_WINE="$HOME/.wine/drive_c/Syntilista/"
 
 QT5PATH="/misc/packages/qt5-src/qtbase/"
-BUILDPATH="release/"
+BUILDPATH="win32/"
 MINGWPATH="/usr/lib/gcc/i686-w64-mingw32/6.3-win32/"
-QMAKE="$QT5PATH/bin/qmake"
 
 do_cpinstall()
 {
@@ -40,20 +39,13 @@
     done
 
     cp -f "$BUILDPATH/Syntilista.exe" "$TARGET"
+    return 0
 }
 
-if test ! -e "$QMAKE"; then
-    echo "ERROR: $QMAKE not found."
-    exit 1
-fi
 
-$QMAKE
+### Create cross-building makefiles
+make -f Makefile.cross-mingw-win32 QT5_PREFIX="$QT5PATH" BINPATH="$BUILDPATH"
 
-#make -f Makefile.Release clean
-make -f Makefile.Release
-
-do_install "$INSTALL_USB"
-rm -f "$INSTALL_USB/syntilista.sqlite3"
+### Install to targets
+do_install "$INSTALL_USB" && rm -f "$INSTALL_USB/syntilista.sqlite3"
 do_install "$INSTALL_WINE"
-
-qmake