Author: cazfi
Date: Wed Feb 24 10:46:53 2016
New Revision: 32058

URL: http://svn.gna.org/viewcvs/freeciv?rev=32058&view=rev
Log:
Updated list of dlls to include to installer packages in msys2 based Installer.

See patch #6990

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=32058&r1=32057&r2=32058&view=diff
==============================================================================
--- trunk/win32/installer_msys2/Makefile        (original)
+++ trunk/win32/installer_msys2/Makefile        Wed Feb 24 10:46:53 2016
@@ -12,8 +12,10 @@
 
 ifeq ($(WINARCH),win64)
 ARCHDIR=/mingw64
+GCCDLL=libgcc_s_seh-1.dll
 else
 ARCHDIR=/mingw32
+GCCDLL=libgcc_s_dw2-1.dll
 endif
 
 # msys2 has dlls in...
@@ -159,7 +161,7 @@
        libffi-6.dll \
        libfontconfig-1.dll \
        libfreetype-6.dll \
-       libgcc_s_dw2-1.dll \
+       $(GCCDLL) \
        libgdk_pixbuf-2.0-0.dll \
        libgio-2.0-0.dll \
        libglib-2.0-0.dll \
@@ -169,14 +171,11 @@
        libiconv-2.dll \
        libintl-8.dll \
        liblzma-5.dll \
-       libogg-0.dll \
        libpango-1.0-0.dll \
        libpangocairo-1.0-0.dll \
        libpangowin32-1.0-0.dll \
        libpixman-1-0.dll \
        libpng16-16.dll \
-       libvorbis-0.dll \
-       libvorbisfile-3.dll \
        libxml2-2.dll \
        zlib1.dll \
        libwinpthread-1.dll
@@ -289,7 +288,7 @@
        libffi-6.dll \
        libfontconfig-1.dll \
        libfreetype-6.dll \
-       libgcc_s_dw2-1.dll \
+       $(GCCDLL) \
        libglib-2.0-0.dll \
        libgdk_pixbuf-2.0-0.dll \
        libgio-2.0-0.dll \


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to