diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-12-18 07:42:17 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-12-18 07:42:17 +0000 |
| commit | 4e254a907ce4f7bfd2d3492188d80495924191ac (patch) | |
| tree | ea00d5760fc326951d401a4b7bcfca8745912602 /config.nmake | |
| parent | 38289963da449371587a51c9e8237ea1d9d43d0e (diff) | |
Prepare to ubdate the GTK bundles
svn path=/trunk/; revision=46585
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/config.nmake b/config.nmake index ed1ae6469e..a1aafd234f 100644 --- a/config.nmake +++ b/config.nmake @@ -265,15 +265,15 @@ XML_DLL=libxml2-2.dll !IF "$(GTK_NAME)" == "gtk2" GDK_DLL=libgdk-win32-2.0-0.dll GTK_DLL=libgtk-win32-2.0-0.dll -#GTK_PKG=2.16.6-20100912 -#GTK_PKG=2.22.1-20101227 GTK_PKG=2.24.10-2.7 +#GTK_PKG=2.24.14-1.1 PKG_SUFIX=ws !ELSE GDK_DLL=libgdk-3-0.dll GTK_DLL=libgtk-3-0.dll PKG_SUFIX=ws -GTK_PKG=3.4.4-2.1 +GTK_PKG=3.4.2-2.9 +#GTK_PKG=3.4.4-2.1 !ENDIF # @@ -283,8 +283,6 @@ GTK_PKG=3.4.4-2.1 # These macros are used by the nsis installer script and by the setup target. # !IF "$(GTK_NAME)" == "gtk2" -#GTK_INST_VERSION=2.16 -#GTK_INST_VERSION=2.22 GTK_INST_VERSION=2.24 !ELSE GTK_INST_VERSION=3.4 @@ -480,14 +478,15 @@ XML_DLL=libxml2-2.dll !IF "$(GTK_NAME)" == "gtk2" GDK_DLL=libgdk-win32-2.0-0.dll GTK_DLL=libgtk-win32-2.0-0.dll -#GTK_PKG=2.16.6-20100912 GTK_PKG=2.24.10-2.7 +#GTK_PKG=2.24.14-1.1 PKG_SUFIX=ws !ELSE GDK_DLL=libgdk-3-0.dll GTK_DLL=libgtk-3-0.dll PKG_SUFIX=ws -GTK_PKG=3.4.4-2.1 +GTK_PKG=3.4.2-3.5 +#GTK_PKG=3.4.4-2.1 !ENDIF # @@ -663,7 +662,7 @@ GTK_MODULES_DIR=lib\gtk-2.0\modules GTK_THEMES_DIR=share\themes\MS-Windows\gtk-2.0 !ELSE GTK_ETC_DIR=etc\gtk-3.0 -GTK_SCHEMAS_DIR=\share\glib-2.0\schemas +#GTK_SCHEMAS_DIR=\share\glib-2.0\schemas !ENDIF |