Author: cazfi
Date: Sun Feb 7 09:54:22 2016
New Revision: 31802
URL: http://svn.gna.org/viewcvs/freeciv?rev=31802&view=rev
Log:
Fixes to Qt-client specific parts of msys2 based Installer build.
To actually build the package still doesn't work because problems of the common
part.
See patch #6897
Modified:
branches/S2_6/doc/README.msys2
branches/S2_6/win32/installer_msys2/Makefile
Modified: branches/S2_6/doc/README.msys2
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.msys2?rev=31802&r1=31801&r2=31802&view=diff
==============================================================================
--- branches/S2_6/doc/README.msys2 (original)
+++ branches/S2_6/doc/README.msys2 Sun Feb 7 09:54:22 2016
@@ -14,7 +14,8 @@
====================================
- With very specific configure options (see Problems) and msys2 package
- selection freeciv can be built. This includes the server and gtk3-client
+ selection freeciv can be built.
+- Buildable clients are gtk3 and Qt
- Both server and client launch ok
- Client cannot connect to the server
- Installers cannot be built
@@ -31,6 +32,8 @@
These packages are needed even if you don't plan to make installer,
but only build freeciv for local use.
+2.1.1) Arch independent packages needed for building freeciv
+
- subversion
- make
- automake
@@ -46,13 +49,21 @@
- libcurl-devel
- liblzma-devel
+2.1.2) Arch-specific packages needed for building freeciv
+
- mingw-w64-i686-gtk3 / mingw-w64-x86_64-gtk3
+ - mingw-w64-i686-qt5 / mingw-w64-x86_64-qt5
-2.2) Packaged needed for building installer
+2.2) Packaged needed for building installer package
+ These are needed in addition to above ones used in the
+ building step already.
+
+2.2.1) Arch-specific packages needed for building installer
+ package
+
- mingw-w64-i686-nsis / mingw-w64-x86_64-nsis
-
-Packages TODO:
+2.3) Packages TODO:
- Mixer support
- Clients other than gtk3
- MagickWand support
@@ -65,6 +76,7 @@
Target can be:
- "<gui>-installer", where <gui> is
- gtk3
+ - qt
Problems
Modified: branches/S2_6/win32/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=31802&r1=31801&r2=31802&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/Makefile (original)
+++ branches/S2_6/win32/installer_msys2/Makefile Sun Feb 7 09:54:22 2016
@@ -36,7 +36,7 @@
make GUI=sdl2 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit
$(EXTRA_CONFIG)" wrap-sdl2
qt-installer:
- make GUI=qt FCMP=qt wrap-qt
+ make GUI=qt FCMP=qt
EXTRA_CONFIG="--with-qt5-includes=$(ARCHDIR)/include
--with-qt5-libs=$(ARCHDIR)/lib $(EXTRA_CONFIG)" wrap-qt
ruledit-installer:
make wrap-ruledit
@@ -249,15 +249,25 @@
QT_DLLS := \
libstdc++-6.dll \
+ libicuin56.dll \
+ libicuuc56.dll \
+ libicudt56.dll \
+ libpcre16-0.dll \
+ libharfbuzz-0.dll \
+ libsqlite3-0.dll \
Qt5Core.dll \
Qt5Gui.dll \
Qt5Widgets.dll
+QT_MSYS_DLLS := \
+ stdc++-6.dll
+
install-env-qt: install-env-common
# add DLLs
cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-$(GUI)
+ cp -R $(addprefix /bin/msys-, $(QT_MSYS_DLLS)) install-$(GUI)
# add additional Qt files
- cp -R /plugins install-$(GUI)/
+ cp -R $(ARCHDIR)/share/qt5/plugins install-$(GUI)/
cp -R /share/locale install-$(GUI)/share/
find install-$(GUI)/share/locale -type f -not -name "freeciv*.mo"
-delete
@@ -266,7 +276,7 @@
cp -R $(addprefix $(DLLPATH_PREFIX), $(COMMON_DLLS)) install-ruledit
cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-ruledit
# add additional Qt files
- cp -R /plugins install-ruledit/
+ cp -R $(ARCHDIR)/share/qt5/plugins install-ruledit/
cp -R /share/locale install-ruledit/share/
find install-ruledit/share/locale -type f -not -name
"freeciv-ruledit.mo" -delete
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
