diff options
| author | Tor Lillqvist <tml@iki.fi> | 2002-05-22 19:37:30 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2002-05-22 19:37:30 +0000 |
| commit | 7952906cd0529caa68ae3549259697495bffd678 (patch) | |
| tree | 68a2fce56b5fc9a7847b10afabb0eb150aca7c9b /gdk-pixbuf | |
| parent | 1528b0ad857757cdb0fd711663192a898501ebc8 (diff) | |
| download | gtk+-7952906cd0529caa68ae3549259697495bffd678.tar.gz | |
Use GTK_BINARY_VERSION (and not GTK_VERSION) in the path to the loaders on
2002-05-22 Tor Lillqvist <tml@iki.fi>
* gdk-pixbuf-io.c (get_libdir): Use GTK_BINARY_VERSION (and not
GTK_VERSION) in the path to the loaders on Win32, too.
* Makefile.am: Pass GTK_BINARY_VERSION.
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 7 | ||||
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 1 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-io.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 0e77158f53..1de74afbe0 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,10 @@ +2002-05-22 Tor Lillqvist <tml@iki.fi> + + * gdk-pixbuf-io.c (get_libdir): Use GTK_BINARY_VERSION (and not + GTK_VERSION) in the path to the loaders on Win32, too. + + * Makefile.am: Pass GTK_BINARY_VERSION. + 2002-05-22 Federico Mena Quintero <federico@ximian.com> * io-xpm.c (pixbuf_create_from_xpm): Ahem, take the rowstride into diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index f39ea266e1..4833092a93 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -231,6 +231,7 @@ INCLUDES = @STRIP_BEGIN@ \ -I$(top_srcdir)/gdk-pixbuf \ -I$(top_builddir)/gdk-pixbuf \ -DGTK_VERSION=\"@GTK_VERSION@\" \ + -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \ -DG_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ @INCLUDED_LOADER_DEFINE@ \ diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index 9b352d089f..b0e03319a8 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -269,7 +269,7 @@ get_libdir (void) if (libdir == NULL) libdir = g_win32_get_package_installation_subdirectory - (GETTEXT_PACKAGE, dll_name, "lib\\gtk-2.0\\" GTK_VERSION "\\loaders"); + (GETTEXT_PACKAGE, dll_name, "lib\\gtk-2.0\\" GTK_BINARY_VERSION "\\loaders"); return libdir; } |