diff --git a/gtk-nsis-pack/bin/libgcc_s_seh_64-1.dll b/gtk-nsis-pack/bin/libgcc_s_seh_64-1.dll new file mode 100644 index 00000000..fc01c90e Binary files /dev/null and b/gtk-nsis-pack/bin/libgcc_s_seh_64-1.dll differ diff --git a/gtk-nsis-pack/bin/libgdk-3-0.dll b/gtk-nsis-pack/bin/libgdk-3-0.dll index 971f4d28..9e5f455d 100644 Binary files a/gtk-nsis-pack/bin/libgdk-3-0.dll and b/gtk-nsis-pack/bin/libgdk-3-0.dll differ diff --git a/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll b/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll index a250b6ab..189e2012 100644 Binary files a/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll and b/gtk-nsis-pack/bin/libgdk-win32-2.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll b/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll index 931e1559..4b61c907 100644 Binary files a/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll and b/gtk-nsis-pack/bin/libgdk_pixbuf-2.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libgdkmm-2.4-1.dll b/gtk-nsis-pack/bin/libgdkmm-2.4-1.dll index ebb216b3..66c2827c 100644 Binary files a/gtk-nsis-pack/bin/libgdkmm-2.4-1.dll and b/gtk-nsis-pack/bin/libgdkmm-2.4-1.dll differ diff --git a/gtk-nsis-pack/bin/libgdkmm-3.0-1.dll b/gtk-nsis-pack/bin/libgdkmm-3.0-1.dll index 85606d11..e7455a1a 100644 Binary files a/gtk-nsis-pack/bin/libgdkmm-3.0-1.dll and b/gtk-nsis-pack/bin/libgdkmm-3.0-1.dll differ diff --git a/gtk-nsis-pack/bin/libgtk-3-0.dll b/gtk-nsis-pack/bin/libgtk-3-0.dll index a6471ee5..3301225c 100644 Binary files a/gtk-nsis-pack/bin/libgtk-3-0.dll and b/gtk-nsis-pack/bin/libgtk-3-0.dll differ diff --git a/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll b/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll index 0295efec..997638ca 100644 Binary files a/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll and b/gtk-nsis-pack/bin/libgtk-win32-2.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libgtkmm-2.4-1.dll b/gtk-nsis-pack/bin/libgtkmm-2.4-1.dll index 68656c22..0544104f 100644 Binary files a/gtk-nsis-pack/bin/libgtkmm-2.4-1.dll and b/gtk-nsis-pack/bin/libgtkmm-2.4-1.dll differ diff --git a/gtk-nsis-pack/bin/libgtkmm-3.0-1.dll b/gtk-nsis-pack/bin/libgtkmm-3.0-1.dll index ed16e846..9882db0a 100644 Binary files a/gtk-nsis-pack/bin/libgtkmm-3.0-1.dll and b/gtk-nsis-pack/bin/libgtkmm-3.0-1.dll differ diff --git a/gtk-nsis-pack/bin/libharfbuzz-0.dll b/gtk-nsis-pack/bin/libharfbuzz-0.dll new file mode 100644 index 00000000..33b851cb Binary files /dev/null and b/gtk-nsis-pack/bin/libharfbuzz-0.dll differ diff --git a/gtk-nsis-pack/bin/libpango-1.0-0.dll b/gtk-nsis-pack/bin/libpango-1.0-0.dll index db18f158..681696f6 100644 Binary files a/gtk-nsis-pack/bin/libpango-1.0-0.dll and b/gtk-nsis-pack/bin/libpango-1.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libpangocairo-1.0-0.dll b/gtk-nsis-pack/bin/libpangocairo-1.0-0.dll index 7eefda68..226fe122 100644 Binary files a/gtk-nsis-pack/bin/libpangocairo-1.0-0.dll and b/gtk-nsis-pack/bin/libpangocairo-1.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libpangoft2-1.0-0.dll b/gtk-nsis-pack/bin/libpangoft2-1.0-0.dll index ed3062d9..c43070cf 100644 Binary files a/gtk-nsis-pack/bin/libpangoft2-1.0-0.dll and b/gtk-nsis-pack/bin/libpangoft2-1.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libpangomm-1.4-1.dll b/gtk-nsis-pack/bin/libpangomm-1.4-1.dll index 061702fe..a5cd8ea1 100644 Binary files a/gtk-nsis-pack/bin/libpangomm-1.4-1.dll and b/gtk-nsis-pack/bin/libpangomm-1.4-1.dll differ diff --git a/gtk-nsis-pack/bin/libpangowin32-1.0-0.dll b/gtk-nsis-pack/bin/libpangowin32-1.0-0.dll index cf8c9e7d..62c4e773 100644 Binary files a/gtk-nsis-pack/bin/libpangowin32-1.0-0.dll and b/gtk-nsis-pack/bin/libpangowin32-1.0-0.dll differ diff --git a/gtk-nsis-pack/bin/libsigc-2.0-0.dll b/gtk-nsis-pack/bin/libsigc-2.0-0.dll new file mode 100644 index 00000000..4a15288d Binary files /dev/null and b/gtk-nsis-pack/bin/libsigc-2.0-0.dll differ diff --git a/gtk-nsis-pack/gtk2-runtime.ts.nsi b/gtk-nsis-pack/gtk2-runtime.ts.nsi index 35e234c1..c0fd3846 100644 --- a/gtk-nsis-pack/gtk2-runtime.ts.nsi +++ b/gtk-nsis-pack/gtk2-runtime.ts.nsi @@ -247,21 +247,28 @@ SectionIn 1 2 RO File bin\libgdkmm-2.4-1.dll File bin\libgio-2.0-0.dll ; from glib File bin\libglib-2.0-0.dll ; glib + File bin\libglibmm-2.4-1.dll ; glib + File bin\libgiomm-2.4-1.dll ; glib + File bin\libsigc-2.0-0.dll + File bin\libglibmm_generate_extra_defs-2.4-1.dll ; glib File bin\libgmodule-2.0-0.dll ; from glib File bin\libgobject-2.0-0.dll ; from glib File bin\libgthread-2.0-0.dll ; from glib File bin\libgtk-win32-2.0-0.dll ; gtk File bin\libgtkmm-2.4-1.dll + File bin\libharfbuzz-0.dll File bin\libintl-8.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 File bin\libpangowin32-1.0-0.dll ; pango, needed by gtk + File bin\libpangoft2-1.0-0.dll ; pango, needed by gtk 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\libxml2-2.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 ; We install this into the same place as the DLLs to avoid any PATH manipulation. SetOutPath "$LIB_INSTDIR" @@ -586,21 +593,28 @@ Function un.DeleteDlls Delete $LIB_INSTDIR\libgdkmm-2.4-1.dll Delete $LIB_INSTDIR\libgio-2.0-0.dll ; from glib Delete $LIB_INSTDIR\libglib-2.0-0.dll ; glib + Delete $LIB_INSTDIR\libglibmm-2.4-1.dll ; glib + Delete $LIB_INSTDIR\libgiomm-2.4-1.dll ; glib + Delete $LIB_INSTDIR\libsigc-2.0-0.dll ; glib + Delete $LIB_INSTDIR\libglibmm_generate_extra_defs-2.4-1.dll ; glib Delete $LIB_INSTDIR\libgmodule-2.0-0.dll ; from glib Delete $LIB_INSTDIR\libgobject-2.0-0.dll ; from glib Delete $LIB_INSTDIR\libgthread-2.0-0.dll ; from glib Delete $LIB_INSTDIR\libgtk-win32-2.0-0.dll ; gtk Delete $LIB_INSTDIR\libgtkmm-2.4-1.dll + Delete $LIB_INSTDIR\libharfbuzz-0.dll Delete $LIB_INSTDIR\libintl-8.dll ; gettext, needed by all i18n libs Delete $LIB_INSTDIR\libpango-1.0-0.dll ; pango, needed by gtk Delete $LIB_INSTDIR\libpangocairo-1.0-0.dll ; pango, needed by gtk Delete $LIB_INSTDIR\libpangowin32-1.0-0.dll ; pango, needed by gtk + Delete $LIB_INSTDIR\libpangoft2-1.0-0.dll ; pango, needed by gtk Delete $LIB_INSTDIR\libpangomm-1.4-1.dll Delete $LIB_INSTDIR\libpixman-1-0.dll ; libpixman, needed by cairo Delete $LIB_INSTDIR\libpng16-16.dll ; for gdk_pixbuf loader. Delete $LIB_INSTDIR\libxml2-2.dll ; fontconfig needs this 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 FunctionEnd