imcross.diff

diff --git a/Contributed/Qt/Makefile.qt4 b/Contributed/Qt/Makefile.qt4
index db561cd..e7d3d56 100644
--- a/Contributed/Qt/Makefile.qt4
+++ b/Contributed/Qt/Makefile.qt4
@@ -432,7 +432,7 @@ ${ZLIB_TARBALL}:
 	wget http://www.zlib.net/${ZLIB_TARBALL}
 
 ${LIBICONV_TARBALL}:
-	wget http://www.gimp.org/~tml/gimp/win32/${LIBICONV_TARBALL}
+	wget http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/${LIBICONV_TARBALL}
 
 ${JAMMER_PROGRAM}:
 	wget http://downloads.sourceforge.net/installjammer/${JAMMER_PROGRAM}
@@ -655,7 +655,7 @@ ifdef gtk_cottrell
 # and piect it together, rather than trying to figure it out ourselves.
 
 ${GTK_BUNDLE}:
-	wget http://ftp.gnome.org/pub/gnome/binaries/win32/gtk+/${GTK_MAJOR}/${GTK_BUNDLE}
+	wget http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gtk+/${GTK_MAJOR}/${GTK_BUNDLE}
 
 ${LIBPNG_BIN_BUNDLE} ${LIBPNG_DEV_BUNDLE} ${LIBJPEG_BIN_BUNDLE} ${LIBJPEG_DEV_BUNDLE} ${LIBTIFF_BIN_BUNDLE} ${LIBTIFF_DEV_BUNDLE}:
 	wget http://downloads.sourceforge.net/gnuwin32/$@
diff --git a/Makefile.common b/Makefile.common
index 9e10c8b..21f585b 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -220,14 +220,14 @@ LIBJPEG_BIN_BUNDLE=jpeg-${LIBJPEG_VERSION}-bin.zip
 LIBJPEG_DEV_BUNDLE=jpeg-${LIBJPEG_VERSION}-lib.zip
 LIBTIFF_BIN_BUNDLE=libtiff-${LIBTIFF_VERSION}.zip
 LIBTIFF_DEV_BUNDLE=libtiff-dev-${LIBTIFF_VERSION}.zip
-PKGCONFIG_BIN_BUNDLE=pkg-config-${PKGCONFIG_VERSION}.zip
-FREETYPE_BIN_BUNDLE=freetype-${FREETYPE_VERSION}.zip
-FREETYPE_DEV_BUNDLE=freetype-dev-${FREETYPE_VERSION}.zip
-FONTCONFIG_BIN_BUNDLE=fontconfig-${FONTCONFIG_VERSION}.zip
-FONTCONFIG_DEV_BUNDLE=fontconfig-dev-${FONTCONFIG_VERSION}.zip
+PKGCONFIG_BIN_BUNDLE=pkg-config_${PKGCONFIG_VERSION}_win32.zip
+FREETYPE_BIN_BUNDLE=freetype_${FREETYPE_VERSION}_win32.zip
+FREETYPE_DEV_BUNDLE=freetype-dev_${FREETYPE_VERSION}_win32.zip
+FONTCONFIG_BIN_BUNDLE=fontconfig_${FONTCONFIG_VERSION}_win32.zip
+FONTCONFIG_DEV_BUNDLE=fontconfig-dev_${FONTCONFIG_VERSION}_win32.zip
 EXPAT_BIN_BUNDLE=expat-${EXPAT_VERSION}.zip
 DIRENT_DEV_BUNDLE=dirent.zip
-PROXYLIBINTL_BIN_BUNDLE=proxy-libintl-${PROXYLIBINTL_VERSION}.zip
+PROXYLIBINTL_BIN_BUNDLE=proxy-libintl_${PROXYLIBINTL_VERSION}_win32.zip
 # For Mac.
 GTK_MAC_BUNDLE=mac-gtk+-${GTK_MAC_VERSION}.tar.bz2
 
@@ -256,7 +256,6 @@ GTK_WIN32_BUNDLES=\
 	${FONTCONFIG_BIN_BUNDLE} \
 	${FONTCONFIG_DEV_BUNDLE} \
 	${EXPAT_BIN_BUNDLE} \
-	${DIRENT_DEV_BUNDLE} \
 	${PROXYLIBINTL_BIN_BUNDLE}
 # Same list, but with setup_ prefixed to each one.	
 GTK_WIN32_SETUPS=$(patsubst %,setup_%,${GTK_WIN32_BUNDLES})
@@ -309,10 +308,10 @@ ${PTHREADS_W32_TARBALL}:
 	wget ftp://sourceware.org/pub/pthreads-win32/$@
 
 ${ZLIB_TARBALL}:
-	wget http://www.zlib.net/$@
+	wget http://sourceforge.net/projects/libpng/files/zlib/${ZLIB_VERSION}/$@
 
 ${LIBICONV_TARBALL}:
-	wget http://www.gimp.org/~tml/gimp/win32/$@
+	wget http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/$@
 
 ${JAMMER_PROGRAM}:
 	#wget http://downloads.sourceforge.net/installjammer/$@
@@ -370,7 +369,7 @@ ${PROXYLIBINTL_BIN_BUNDLE}:
 	wget ${GTK_WIN32_SITE}/dependencies/$@
 
 ${DIRENT_DEV_BUNDLE}:
-	wget http://www.gimp.org/~tml/gimp/win32/${DIRENT_DEV_BUNDLE}
+	wget http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/${DIRENT_DEV_BUNDLE}
 
 # End of GTK+ stuff for Windows.
 
@@ -447,7 +446,7 @@ GTK_FRAMEWORK=Gtk-Framework-${GTK_MAJOR}-LATEST.dmg
 
 # Download the GTK+ framework.
 ${GTK_FRAMEWORK}:
-	wget http://ftp.imendio.com/pub/imendio/gtk-osx/${GTK_FRAMEWORK}
+	wget 'http://sourceforge.jp/frs/g_redir.php?m=jaist&f=%2Fmokoi%2FThird+Party%2FGtk-Framework-2.14-LATEST.dmg'
 
 # Unpack the GTK+ framwork bundle to get at the gooey center.
 ${BUILD_DIR}/framework:
diff --git a/Makefile.default-settings b/Makefile.default-settings
index 5ef8e71..939a72d 100644
--- a/Makefile.default-settings
+++ b/Makefile.default-settings
@@ -99,7 +99,7 @@ PATH:=${PATH}:${PREFIX_WIN32}/bin
 # At present, please use Xcode 3.0 or 3.1.1, as Xcode 2 support is 
 # temporarily broken, and only the Xcode 3 versions mentioned have
 # been tested.
-XCODE_VERSION=3.0
+XCODE_VERSION=3.2.6
 MACOSX_VERSION=10.4u
 
 ifeq "${XCODE_VERSION}" "2.2.1"
@@ -132,6 +132,10 @@ ifeq "${XCODE_VERSION}" "3.1.1"
 XCODE3=yes
 endif
 
+ifeq "${XCODE_VERSION}" "3.2.6"
+XCODE3=yes
+endif
+
 ifndef XCODE3
 XCODE3=no
 endif
@@ -245,7 +249,7 @@ WXMINOR=9
 #WXSTRCONV=strconv-2008-10-09.cpp
 MINGW_RUNTIME_VERSION=3.14
 W32API_VERSION=3.11
-PCRE_VERSION=7.6
+PCRE_VERSION=8.12
 PTHREADS_W32_VERSION=2-8-0
 ZLIB_VERSION=1.2.3
 #JAMMER_VERSION=1.2.5
@@ -274,19 +278,19 @@ PANGO_MINOR=4-1
 ATK_MAJOR=1.24
 ATK_MINOR=0-1
 CAIRO_MAJOR=1.8
-CAIRO_MINOR=6-1
+CAIRO_MINOR=8-4
 # zlib is installed separately from gtk+.
 # iconv is installed separately from gtk+.
 GETTEXT_VERSION=0.17-1
-LIBPNG_VERSION=1.2.34-1
+LIBPNG_VERSION=1.2.37-1
 LIBJPEG_VERSION=6b-4
 LIBTIFF_VERSION=3.8.2
-PKGCONFIG_VERSION=0.23-2
-FREETYPE_VERSION=2.3.6
-FONTCONFIG_VERSION=2.4.2-tml-20071015
+PKGCONFIG_VERSION=0.23-3
+FREETYPE_VERSION=2.3.11-1
+FONTCONFIG_VERSION=2.6.0-2
 EXPAT_VERSION=2.0.0
 # dirent does not seem to *have* a version.
-PROXYLIBINTL_VERSION=20080805
+PROXYLIBINTL_VERSION=20090911
 
 # For Mac.
 GTK_MAC_VERSION=2.14.7-1