diff build-win32.sh @ 69:a242548ccce8

Build system cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 10 Apr 2017 00:24:33 +0300
parents 423d2383a605
children cde3d200967c
line wrap: on
line diff
--- a/build-win32.sh	Sun Apr 09 15:54:06 2017 +0300
+++ b/build-win32.sh	Mon Apr 10 00:24:33 2017 +0300
@@ -2,8 +2,11 @@
 INSTALL_USB="/mnt/sdb1/Syntilista/"
 INSTALL_WINE="$HOME/.wine/drive_c/Syntilista/"
 
-QT5PATH="/misc/packages/qt5-src/qtbase/"
 BUILDPATH="win32/"
+
+QT5_PREFIX="/misc/packages/qt5-src"
+QT5_BASE="${QT5_PREFIX}/qtbase"
+
 MINGWPATH="/usr/lib/gcc/i686-w64-mingw32/6.3-win32/"
 
 do_cpinstall()
@@ -27,10 +30,11 @@
 
     echo "Installing to '$TARGET' ..."
 
-    do_cpinstall "$QT5PATH/plugins/" "$TARGET" "platforms" "qwindows.dll"
-    do_cpinstall "$QT5PATH/plugins/" "$TARGET" "sqldrivers" "qsqlite.dll"
+    do_cpinstall "$QT5_BASE/plugins/" "$TARGET" "platforms" "qwindows.dll"
+    do_cpinstall "$QT5_BASE/plugins/" "$TARGET" "sqldrivers" "qsqlite.dll"
+
     for i in Core Gui Sql Widgets; do
-        cp -f "$QT5PATH/bin/Qt5$i.dll" "$TARGET"
+        cp -f "$QT5_BASE/lib/Qt5$i.dll" "$TARGET"
     done
 
     for i in libstdc++-6 libgcc_s_sjlj-1; do
@@ -45,7 +49,7 @@
 
 
 ### Create cross-building makefiles
-make -f Makefile.cross-mingw-win32 QT5_PREFIX="$QT5PATH" BINPATH="$BUILDPATH"
+make -f Makefile.cross-mingw-win32 QT5_PREFIX="$QT5_PREFIX" BINPATH="$BUILDPATH"
 
 ### Install to targets
 do_install "$INSTALL_USB" && rm -f "$INSTALL_USB/syntilista.sqlite3"