Author: cazfi
Date: Mon May 16 14:55:56 2016
New Revision: 32724
URL: http://svn.gna.org/viewcvs/freeciv?rev=32724&view=rev
Log:
Enabled NLS on msys2 builds
See patch #6985
Modified:
trunk/win32/installer_msys2/Makefile
Modified: trunk/win32/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=32724&r1=32723&r2=32724&view=diff
==============================================================================
--- trunk/win32/installer_msys2/Makefile (original)
+++ trunk/win32/installer_msys2/Makefile Mon May 16 14:55:56 2016
@@ -73,7 +73,7 @@
# create build directory
mkdir -p build-$(WINARCH)-$(GUI)
# configure
- cd build-$(WINARCH)-$(GUI); ../../../configure
FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)"
--enable-client=$(GUI) --with-followtag="win32-S3_0" --without-readline
--disable-sdl-mixer --disable-nls --without-libbz2 --enable-fcmp=$(FCMP)
$(EXTRA_CONFIG)
+ cd build-$(WINARCH)-$(GUI); ../../../configure
FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)"
--enable-client=$(GUI) --with-followtag="win32-S3_0" --without-readline
--disable-sdl-mixer --without-libbz2 --enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
# make
make -C build-$(WINARCH)-$(GUI)
make -C build-$(WINARCH)-$(GUI)/translations/core update-po
@@ -109,6 +109,7 @@
mv install-$(WINARCH)-$(GUI)/usr/local/etc install-$(WINARCH)-$(GUI)/
mv install-$(WINARCH)-$(GUI)/usr/local/share/freeciv
install-$(WINARCH)-$(GUI)/data
mkdir -p install-$(WINARCH)-$(GUI)/share
+ mv install-$(WINARCH)-$(GUI)/usr/local/share/locale
install-$(WINARCH)-$(GUI)/share/
mv install-$(WINARCH)-$(GUI)/usr/local/share/doc
install-$(WINARCH)-$(GUI)/doc
mkdir -p install-$(WINARCH)-$(GUI)/debuginfo
cp build-$(WINARCH)-$(GUI)/gen_headers/fc_config.h
install-$(WINARCH)-$(GUI)/debuginfo
@@ -245,6 +246,8 @@
cp -R $(ARCHDIR)/etc/gtk-3.0 install-$(WINARCH)-$(GUI)/etc/
mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
cp -R $(ARCHDIR)/lib/gtk-3.0/* install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
+ cp -R $(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/
+ find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name
"freeciv*.mo" -and -not -name gtk30.mo -delete
install-env-gtk3x: install-env-default-fcmp
@@ -262,6 +265,8 @@
cp -R /etc/gtk-2.0 install-$(WINARCH)-$(GUI)/etc/
mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-2.0/
cp -R /lib/gtk-2.0/2.10.0 install-$(WINARCH)-$(GUI)/lib/gtk-2.0/
+ cp -R $(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/
+ find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name
"freeciv*.mo" -and -not -name gtk20.mo -delete
SDL2_DLLS := \
libpng12-0.dll \
@@ -293,6 +298,8 @@
cp -R $(addprefix /bin/msys-, $(QT_MSYS_DLLS)) install-$(WINARCH)-$(GUI)
# add additional Qt files
cp -R $(ARCHDIR)/share/qt5/plugins install-$(WINARCH)-$(GUI)/
+ cp -R $(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/
+ find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name
"freeciv*.mo" -delete
# TODO: Clean out unnecessary ones. These are just copies of COMMON_DLLS and
# COMMON_MSYS_DLLS with most obviously unnecessary things left out.
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
