Author: cazfi
Date: Sat Feb 4 09:23:21 2017
New Revision: 34950
URL: http://svn.gna.org/viewcvs/freeciv?rev=34950&view=rev
Log:
Added cross-building of Windows Installer for Qt-client.
See patch #8096
Added:
branches/S3_0/windows/installer_cross/freeciv-mp-qt.cmd (with props)
branches/S3_0/windows/installer_cross/freeciv-qt.cmd (with props)
Modified:
branches/S3_0/windows/Makefile.am
branches/S3_0/windows/installer_cross/installer_build.sh
Modified: branches/S3_0/windows/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/Makefile.am?rev=34950&r1=34949&r2=34950&view=diff
==============================================================================
--- branches/S3_0/windows/Makefile.am (original)
+++ branches/S3_0/windows/Makefile.am Sat Feb 4 09:23:21 2017
@@ -35,6 +35,8 @@
installer_cross/freeciv-server.cmd \
installer_cross/freeciv-gtk3.22.cmd \
installer_cross/freeciv-mp-gtk3.cmd \
+ installer_cross/freeciv-qt.cmd \
+ installer_cross/freeciv-mp-qt.cmd \
installer_cross/licenses/COPYING.installer
if MINGW
Added: branches/S3_0/windows/installer_cross/freeciv-mp-qt.cmd
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_cross/freeciv-mp-qt.cmd?rev=34950&view=auto
==============================================================================
--- branches/S3_0/windows/installer_cross/freeciv-mp-qt.cmd (added)
+++ branches/S3_0/windows/installer_cross/freeciv-mp-qt.cmd Sat Feb 4
09:23:21 2017
@@ -0,0 +1,4 @@
+@echo off
+if %1 NEQ auto set LANG=%1
+set QT_PLUGIN_PATH=%~dp0\plugins
+start freeciv-mp-qt.exe %2 %3 %4 %5 %6 %7 %8 %9
Propchange: branches/S3_0/windows/installer_cross/freeciv-mp-qt.cmd
------------------------------------------------------------------------------
svn:eol-style = CRLF
Propchange: branches/S3_0/windows/installer_cross/freeciv-mp-qt.cmd
------------------------------------------------------------------------------
svn:executable = *
Added: branches/S3_0/windows/installer_cross/freeciv-qt.cmd
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_cross/freeciv-qt.cmd?rev=34950&view=auto
==============================================================================
--- branches/S3_0/windows/installer_cross/freeciv-qt.cmd (added)
+++ branches/S3_0/windows/installer_cross/freeciv-qt.cmd Sat Feb 4
09:23:21 2017
@@ -0,0 +1,4 @@
+@echo off
+if %1 NEQ auto set LANG=%1
+set QT_PLUGIN_PATH=%~dp0\plugins
+start freeciv-qt.exe %2 %3 %4 %5 %6 %7 %8 %9
Propchange: branches/S3_0/windows/installer_cross/freeciv-qt.cmd
------------------------------------------------------------------------------
svn:eol-style = CRLF
Propchange: branches/S3_0/windows/installer_cross/freeciv-qt.cmd
------------------------------------------------------------------------------
svn:executable = *
Modified: branches/S3_0/windows/installer_cross/installer_build.sh
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_cross/installer_build.sh?rev=34950&r1=34949&r2=34950&view=diff
==============================================================================
--- branches/S3_0/windows/installer_cross/installer_build.sh (original)
+++ branches/S3_0/windows/installer_cross/installer_build.sh Sat Feb 4
09:23:21 2017
@@ -1,14 +1,24 @@
#!/bin/bash
-if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" ; then
- echo "Usage: $0 <crosser dir>"
+if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" || test
"x$2" = "x" ; then
+ echo "Usage: $0 <crosser dir> <gui>"
exit 1
fi
DLLSPATH="$1"
-GUI="gtk3.22"
-GUINAME="GTK3.22"
-FCMP="gtk3"
+GUI="$2"
+
+case $GUI in
+ gtk3.22)
+ GUINAME="GTK3.22"
+ FCMP="gtk3" ;;
+ qt)
+ GUINAME="Qt"
+ FCMP="qt" ;;
+ *)
+ echo "Unknown gui type \"$GUI\"" >&2
+ exit 1 ;;
+esac
if ! test -d "$DLLSPATH" ; then
echo "Dllstack directory \"$DLLSPATH\" not found!" >&2
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
