Author: cazfi
Date: Sat Feb  4 09:23:14 2017
New Revision: 34949

URL: http://svn.gna.org/viewcvs/freeciv?rev=34949&view=rev
Log:
Added cross-building of Windows Installer for Qt-client.

See patch #8096

Added:
    trunk/windows/installer_cross/freeciv-mp-qt.cmd   (with props)
    trunk/windows/installer_cross/freeciv-qt.cmd   (with props)
Modified:
    trunk/windows/Makefile.am
    trunk/windows/installer_cross/installer_build.sh

Modified: trunk/windows/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/windows/Makefile.am?rev=34949&r1=34948&r2=34949&view=diff
==============================================================================
--- trunk/windows/Makefile.am   (original)
+++ trunk/windows/Makefile.am   Sat Feb  4 09:23:14 2017
@@ -32,6 +32,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: trunk/windows/installer_cross/freeciv-mp-qt.cmd
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/freeciv-mp-qt.cmd?rev=34949&view=auto
==============================================================================
--- trunk/windows/installer_cross/freeciv-mp-qt.cmd     (added)
+++ trunk/windows/installer_cross/freeciv-mp-qt.cmd     Sat Feb  4 09:23:14 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: trunk/windows/installer_cross/freeciv-mp-qt.cmd
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: trunk/windows/installer_cross/freeciv-mp-qt.cmd
------------------------------------------------------------------------------
    svn:executable = *

Added: trunk/windows/installer_cross/freeciv-qt.cmd
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/freeciv-qt.cmd?rev=34949&view=auto
==============================================================================
--- trunk/windows/installer_cross/freeciv-qt.cmd        (added)
+++ trunk/windows/installer_cross/freeciv-qt.cmd        Sat Feb  4 09:23:14 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: trunk/windows/installer_cross/freeciv-qt.cmd
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Propchange: trunk/windows/installer_cross/freeciv-qt.cmd
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/windows/installer_cross/installer_build.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_cross/installer_build.sh?rev=34949&r1=34948&r2=34949&view=diff
==============================================================================
--- trunk/windows/installer_cross/installer_build.sh    (original)
+++ trunk/windows/installer_cross/installer_build.sh    Sat Feb  4 09:23:14 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

Reply via email to