Author: cazfi
Date: Wed Sep 14 08:29:25 2016
New Revision: 33800
URL: http://svn.gna.org/viewcvs/freeciv?rev=33800&view=rev
Log:
Fixed sdl2-client part of msys2 Windows Installer Makefile.
See patch #7684
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=33800&r1=33799&r2=33800&view=diff
==============================================================================
--- branches/S2_6/doc/README.msys2 (original)
+++ branches/S2_6/doc/README.msys2 Wed Sep 14 08:29:25 2016
@@ -13,7 +13,7 @@
build method
- With very specific configure options (see Problems) and msys2 package
selection freeciv can be built
-- Buildable clients are gtk3, gtk2, and Qt
+- Buildable clients are gtk3, gtk2, sdl2, and Qt
- Official pre-made msys2 environment supports only gtk3-client build
- Both server, gtk3-client, and gtk2-client launch ok, Qt client does not
- Most Installers cannot be built
@@ -99,6 +99,11 @@
2.1.2.4) Arch-specific packages for building gtk2-client
- mingw-w64-i686-gtk2 / mingw-w64-x86_64-gtk2
+
+2.1.2.5) Arch-specific packages for building sdl2-client
+ - mingw-w64-i686-SDL2_image / mingw-w64-x86_64-SDL2_image
+ - mingw-w64-i686-SDL2_ttf / mingw-w64-x86_64-SDL2_ttf
+ - mingw-w64-i686-SDL2_gfx / mingw-w64-x86_64-SDL2_gfx
2.2) Packaged needed for building installer package
These are needed in addition to above ones used in the
@@ -175,6 +180,7 @@
- "<gui>-installer", where <gui> is
- gtk3
- gtk2
+ - sdl2
- qt
- "ruledit-installer"
- "snapshot", if your freeciv sources are in svn checkout directory
Modified: branches/S2_6/win32/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=33800&r1=33799&r2=33800&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/Makefile (original)
+++ branches/S2_6/win32/installer_msys2/Makefile Wed Sep 14 08:29:25 2016
@@ -124,13 +124,6 @@
install-freeciv-gtk2: install-freeciv-common
install-freeciv-sdl2: install-freeciv-common
- # add CJK fonts
- cp /opt/fireflysung-1.3.0/fireflysung.ttf
install-$(WINARCH)-sdl2/data/themes/gui-sdl2/human/
- cp /opt/fireflysung-1.3.0/COPYRIGHT
install-$(WINARCH)-sdl2/data/themes/gui-sdl2/human/COPYING.fireflysung
- cp /opt/sazanami-20040629/sazanami-gothic.ttf
install-$(WINARCH)-sdl2/data/themes/gui-sdl2/human/
- cp /opt/sazanami-20040629/README
install-$(WINARCH)-sdl2/data/themes/gui-sdl2/human/COPYING.sazanami
- cp /opt/un-fonts/UnDotum.ttf
install-$(WINARCH)-sdl2/data/themes/gui-sdl2/human/
- cp /opt/un-fonts/COPYING
install-$(WINARCH)-sdl2/data/themes/gui-sdl2/human/COPYING.UnDotum
install-freeciv-qt: install-freeciv-common
# strip 'freeciv-ruledit' executable
@@ -267,10 +260,12 @@
find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name
"freeciv*.mo" -and -not -name gtk20.mo -delete
SDL2_DLLS := \
- libpng12-0.dll \
- libSDL2_gfx-15.dll \
+ libSDL2_gfx-1-0-0.dll \
SDL2_image.dll \
- SDL2_ttf.dll
+ SDL2_ttf.dll \
+ libjpeg-8.dll \
+ libtiff-5.dll \
+ libwebp-6.dll
install-env-sdl2: install-env-default-fcmp
# add DLLs
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
