Commit d2446eab authored by Bruno Coudoin's avatar Bruno Coudoin

windows: upgraded to gtk+-bundle_2.24.10-20120208

This fixes an issue in which users on Windows XP with a 16 bits
display color depth could not start GCompris.
parent 67263949
......@@ -62,9 +62,9 @@ NEEDED_DLLS = $(GNUCHESS_TOP)/bin/pthreadGC2.dll \
$(FONTCONFIG_TOP)/bin/libfontconfig-1.dll \
$(FREETYPE_TOP)/bin/freetype6.dll \
$(GNUCAP_TOP)/src/MSW/gnucap.exe \
$(GTK_TOP)/bin/gspawn-win32-helper-console.exe \
$(GTK_TOP)/bin/gspawn-win32-helper.exe \
$(GTK_TOP)/bin/intl.dll \
$(GTK_TOP)/bin/libjpeg-7.dll \
$(GTK_TOP)/bin/libatk-1.0-0.dll \
$(GTK_TOP)/bin/libcairo-2.dll \
$(GTK_TOP)/bin/libexpat-1.dll \
......@@ -139,6 +139,7 @@ prepack: Makefile.mingw
cp -r $(LOCAL_PREFIX)/Microsoft.VC90.CRT $(GCOMPRIS_INSTALL_DIR)
cp $(NEEDED_FILES) $(GCOMPRIS_INSTALL_DIR)
cp -r $(GTK_TOP)/etc $(GCOMPRIS_INSTALL_DIR)
rm -rf $(GCOMPRIS_INSTALL_DIR)/etc/bash_completion.d
cp -r $(GTK_TOP)/manifest $(GCOMPRIS_INSTALL_DIR)
mkdir -p $(GCOMPRIS_INSTALL_DIR)/share
cp -r $(GTK_TOP)/share/themes $(GCOMPRIS_INSTALL_DIR)/share
......
......@@ -326,6 +326,7 @@ Section Uninstall
Delete "$INSTDIR\bin\gnuchess.exe"
RMDir "$INSTDIR\bin"
Delete "$INSTDIR\gobject.pyd"
Delete "$INSTDIR\gspawn-win32-helper-console.exe"
Delete "$INSTDIR\gspawn-win32-helper.exe"
Delete "$INSTDIR\iconv.dll"
Delete "$INSTDIR\intl.dll"
......@@ -395,12 +396,13 @@ Section Uninstall
Delete "$INSTDIR\Microsoft.VC90.CRT\msvcp90.dll"
Delete "$INSTDIR\Microsoft.VC90.CRT\msvcr90.dll"
RMDir "$INSTDIR\Microsoft.VC90.CRT"
Delete "$INSTDIR\manifest\gtk+-bundle_2.24.8-20111122_win32.mft"
Delete "$INSTDIR\manifest\gtk+-bundle_2.24.10-20120208_win32.mft"
Delete "$INSTDIR\manifest\libcroco_0.6.2-1_win32.mft"
Delete "$INSTDIR\manifest\libgsf_1.14.17-1_win32.mft"
Delete "$INSTDIR\manifest\librsvg_2.32.1-1_win32.mft"
Delete "$INSTDIR\manifest\librsvg-dev_2.32.1-1_win32.mft"
Delete "$INSTDIR\manifest\svg-gdk-pixbuf-loader_2.32.1-1_win32.mft"
Delete "$INSTDIR\manifest\svg-gtk-engine_2.32.1-1_win32.mft"
RMDir "$INSTDIR\manifest"
;Try to remove GCompris install dir .. if empty
......
......@@ -64,4 +64,4 @@ GNUCAP_TOP := $(LOCAL_PREFIX)/gnucap
SQLITE_TOP := $(LOCAL_PREFIX)/sqlite
FONTCONFIG_TOP := $(LOCAL_PREFIX)/gtk
ICONV_TOP := $(LOCAL_PREFIX)/iconv
FREETYPE_TOP := $(LOCAL_PREFIX)/freetype
FREETYPE_TOP := $(LOCAL_PREFIX)/gtk
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment