Mercurial > hg > syntilista

changeset 283:958451fcd85a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename various variables etc.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 09 May 2023 11:03:00 +0300
parents f05e9c74a022
children ea0513940991
files build-win32.sh
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/build-win32.sh	Tue May 09 11:02:10 2023 +0300
+++ b/build-win32.sh	Tue May 09 11:03:00 2023 +0300
@@ -5,8 +5,9 @@
 
 BUILDPATH="win32/"
 
-QT5_PREFIX="/misc/packages/qt5-src"
-QT5_BASE="${QT5_PREFIX}/qtbase"
+QT_VERSION_PREFIX="Qt5"
+QT_PREFIX="/misc/packages/qt5-src"
+QT_BASE="${QT_PREFIX}/qtbase"
 
 MINGWPATH="$(dirname $(i686-w64-mingw32-g++ -print-prog-name=cc1))"
 MINGWLIBS="/usr/i686-w64-mingw32/lib/"
@@ -57,12 +58,12 @@
 
     echo "Installing to '${TARGET}' ..."
 
-    do_cpinstall "${QT5_BASE}/plugins/" "$TARGET" "platforms" "qwindows.dll"
-    do_cpinstall "${QT5_BASE}/plugins/" "$TARGET" "sqldrivers" "qsqlite.dll"
-    do_cpinstall "${QT5_BASE}/plugins/" "$TARGET" "printsupport" "windowsprintersupport.dll"
+    do_cpinstall "${QT_BASE}/plugins/" "$TARGET" "platforms" "qwindows.dll"
+    do_cpinstall "${QT_BASE}/plugins/" "$TARGET" "sqldrivers" "qsqlite.dll"
+    do_cpinstall "${QT_BASE}/plugins/" "$TARGET" "printsupport" "windowsprintersupport.dll"
 
     for i in Core Gui Sql Widgets PrintSupport Network; do
-        do_cp "${QT5_BASE}/lib/Qt5${i}.dll" "$TARGET"
+        do_cp "${QT_BASE}/lib/${QT_VERSION_PREFIX}${i}.dll" "$TARGET"
     done
 
     for i in libstdc++-6 libgcc_s_sjlj-1; do
@@ -82,7 +83,7 @@
 
 
 ### Build the binaries
-make -f Makefile.cross-mingw QT5_PREFIX="$QT5_PREFIX" BINPATH="$BUILDPATH"
+make -f Makefile.cross-mingw QT_PREFIX="$QT_PREFIX" BINPATH="$BUILDPATH"
 
 ### Install to targets
 if test -d "$INSTALL_USB" && mount|grep -q "$INSTALL_USB"; then