Author: cazfi Date: Fri Feb 5 18:26:47 2016 New Revision: 31771 URL: http://svn.gna.org/viewcvs/freeciv?rev=31771&view=rev Log: Include files matching the arch to msys2 bases Installer packages, instead of always using win32 files.
See patch #6896 Modified: branches/S2_6/win32/installer_msys2/Makefile Modified: branches/S2_6/win32/installer_msys2/Makefile URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=31771&r1=31770&r2=31771&view=diff ============================================================================== --- branches/S2_6/win32/installer_msys2/Makefile (original) +++ branches/S2_6/win32/installer_msys2/Makefile Fri Feb 5 18:26:47 2016 @@ -5,13 +5,23 @@ # # +# Variable setup +# + +WINARCH=$(shell ./win_arch.sh) + +ifeq ($(WINARCH),win64) +ARCHDIR=/mingw64 +else +ARCHDIR=/mingw32 +endif + +# msys2 has dlls in... +DLLPATH_PREFIX=$(ARCHDIR)/bin/ + +# # Make rules # - -# msys2 has dlls in... -DLLPATH_PREFIX=/mingw32/bin/ - -WINARCH=$(shell ./win_arch.sh) # by default build all installers all: gtk3-installer gtk2-installer sdl2-installer qt-installer ruledit-installer @@ -204,9 +214,9 @@ cp -R $(addprefix $(DLLPATH_PREFIX), $(DEFAULT_FCMP_DLLS)) install-$(GUI) # add additional GTK+3 files mkdir -p install-$(GUI)/etc - cp -R /mingw32/etc/gtk-3.0 install-$(GUI)/etc/ + cp -R $(ARCHDIR)/etc/gtk-3.0 install-$(GUI)/etc/ mkdir -p install-$(GUI)/lib/gtk-3.0/ - cp -R /mingw32/lib/gtk-3.0/* install-$(GUI)/lib/gtk-3.0/ + cp -R $(ARCHDIR)/lib/gtk-3.0/* install-$(GUI)/lib/gtk-3.0/ cp -R /share/locale install-$(GUI)/share/ find install-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -and -not -name gtk30.mo -delete _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits