Modified the binary files to use MSYS2 environment of GTK (mingw64 folder)

Also added a script which copies all necessary files from the appropriate MSYS2/mingw64 folders to the bin folder of the install environment
Updated GTK3 NSI script
This commit is contained in:
peterbud
2016-09-05 21:21:51 +02:00
parent 9ee00261c1
commit eb4d5b4717
69 changed files with 149 additions and 14 deletions

View File

@@ -13,7 +13,7 @@
!define GTK_VERSION "3.20.2"
!define GTK_BIN_VERSION "3.0.0"
!define PRODUCT_VERSION "${GTK_VERSION}-2016-04-09-ts-win64"
!define PRODUCT_VERSION "${GTK_VERSION}-2016-09-05-ts-win64"
!define PRODUCT_NAME "GTK3-Runtime Win64"
!define PRODUCT_PUBLISHER "Tom Schoonjans"
!define PRODUCT_WEB_SITE "https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer"
@@ -89,7 +89,7 @@ ShowUnInstDetails show
; Only useful for BZIP2 compression
ReserveFile "nsi_pathpage.ini"
ReserveFile "nsi_configpage.ini"
ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
ReserveFile "${NSISDIR}\Plugins\x86-unicode\InstallOptions.dll"
; Pages to show during installation
@@ -261,7 +261,7 @@ SectionIn 1 2 RO
File bin\libgtkmm-3.0-1.dll
File bin\libharfbuzz-0.dll
File bin\libintl-8.dll ; gettext, needed by all i18n libs
File bin\iconv.dll
File bin\libiconv-2.dll
File bin\libjson-glib-1.0-0.dll ; gettext, needed by all i18n libs
File bin\libpango-1.0-0.dll ; pango, needed by gtk
File bin\libpangocairo-1.0-0.dll ; pango, needed by gtk
@@ -270,15 +270,21 @@ SectionIn 1 2 RO
File bin\libpangomm-1.4-1.dll
File bin\libpixman-1-0.dll ; libpixman, needed by cairo
File bin\libpng16-16.dll ; for gdk_pixbuf loader.
File bin\libxml++-2.6-2.dll ; fontconfig needs this
File bin\libxml++-3.0-1.dll
; File bin\libxml++-2.6-2.dll ; fontconfig needs this
; File bin\libxml++-3.0-1.dll
File bin\libxml2-2.dll ; fontconfig needs this
File bin\libxslt-1.dll ; fontconfig needs this
File bin\libpcre-1.dll ; fontconfig needs this
File bin\zlib1.dll ; png and many others need this
File bin\libstdc++_64-6.dll
File bin\libgcc_s_seh_64-1.dll
File bin\libwinpthread_64-1.dll
File bin\libgtk-win32-2.0-0.dll
File bin\libgdk-win32-2.0-0.dll
File bin\libexpat-1.dll
File bin\libbz2-1.dll
File bin\libgraphite2.dll
File bin\librsvg-2-2.dll
File bin\libstdc++-6.dll
File bin\libgcc_s_seh-1.dll
File bin\libwinpthread-1.dll
; We install this into the same place as the DLLs to avoid any PATH manipulation.
SetOutPath "$LIB_INSTDIR"
@@ -614,7 +620,7 @@ Function un.DeleteDlls
Delete $LIB_INSTDIR\libgtkmm-3.0-1.dll
Delete $LIB_INSTDIR\libharfbuzz-0.dll
Delete $LIB_INSTDIR\libintl-8.dll ; gettext, needed by all i18n libs
Delete $LIB_INSTDIR\iconv.dll
Delete $LIB_INSTDIR\libiconv-2.dll
Delete $LIB_INSTDIR\libjson-glib-1.0-0.dll
Delete $LIB_INSTDIR\libpango-1.0-0.dll ; pango, needed by gtk
Delete $LIB_INSTDIR\libpangocairo-1.0-0.dll ; pango, needed by gtk
@@ -626,12 +632,18 @@ Function un.DeleteDlls
Delete $LIB_INSTDIR\libxslt-1.dll ; fontconfig needs this
Delete $LIB_INSTDIR\libpcre-1.dll ; fontconfig needs this
Delete $LIB_INSTDIR\libxml2-2.dll ; fontconfig needs this
Delete $LIB_INSTDIR\libxml++-2.6-2.dll ; fontconfig needs this
Delete $LIB_INSTDIR\libxml++-3.0-1.dll
; Delete $LIB_INSTDIR\libxml++-2.6-2.dll ; fontconfig needs this
; Delete $LIB_INSTDIR\libxml++-3.0-1.dll
Delete $LIB_INSTDIR\zlib1.dll ; png and many others need this
Delete $LIB_INSTDIR\libstdc++_64-6.dll
Delete $LIB_INSTDIR\libgcc_s_seh_64-1.dll
Delete $LIB_INSTDIR\libwinpthread_64-1.dll
Delete $LIB_INSTDIR\libgtk-win32-2.0-0.dll
Delete $LIB_INSTDIR\libgdk-win32-2.0-0.dll
Delete $LIB_INSTDIR\libexpat-1.dll
Delete $LIB_INSTDIR\libbz2-1.dll
Delete $LIB_INSTDIR\libgraphite2.dll
Delete $LIB_INSTDIR\librsvg-2-2.dll
Delete $LIB_INSTDIR\libstdc++-6.dll
Delete $LIB_INSTDIR\libgcc_s_seh-1.dll
Delete $LIB_INSTDIR\libwinpthread-1.dll
FunctionEnd