Author: cazfi Date: Thu Jun 30 07:04:02 2016 New Revision: 33112 URL: http://svn.gna.org/viewcvs/freeciv?rev=33112&view=rev Log: Use arch specific gcc_s filename while building msys2 installer packages
See patch #7344 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=33112&r1=33111&r2=33112&view=diff ============================================================================== --- trunk/win32/installer_msys2/Makefile (original) +++ trunk/win32/installer_msys2/Makefile Thu Jun 30 07:04:02 2016 @@ -12,10 +12,12 @@ ifeq ($(WINARCH),win64) ARCHDIR=/mingw64 -GCCDLL=libgcc_s_seh-1.dll +LIBGCCDLL=libgcc_s_seh-1.dll +GCCDLL=gcc_s-seh-1.dll else ARCHDIR=/mingw32 -GCCDLL=libgcc_s_dw2-1.dll +LIBGCCDLL=libgcc_s_dw2-1.dll +GCCDLL=gcc_s-1.dll endif ifeq ($(MIN_WIN_VER),) @@ -175,7 +177,7 @@ libffi-6.dll \ libfontconfig-1.dll \ libfreetype-6.dll \ - $(GCCDLL) \ + $(LIBGCCDLL) \ libgdk_pixbuf-2.0-0.dll \ libgio-2.0-0.dll \ libglib-2.0-0.dll \ @@ -203,7 +205,7 @@ idn-11.dll \ sqlite3-0.dll \ ssl-1.0.0.dll \ - gcc_s-1.dll \ + $(GCCDLL) \ z.dll \ bz2-1.dll \ crypto-1.0.0.dll \ @@ -313,7 +315,7 @@ libffi-6.dll \ libfontconfig-1.dll \ libfreetype-6.dll \ - $(GCCDLL) \ + $(LIBGCCDLL) \ libglib-2.0-0.dll \ libgdk_pixbuf-2.0-0.dll \ libgio-2.0-0.dll \ @@ -335,7 +337,7 @@ idn-11.dll \ sqlite3-0.dll \ ssl-1.0.0.dll \ - gcc_s-1.dll \ + $(GCCDLL) \ z.dll \ bz2-1.dll \ crypto-1.0.0.dll \ _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits