Add rule for make-inline-pixbuf. Use gdk-pixbuf's version number in the

2000-10-03  Tor Lillqvist  <tml@iki.fi>

	* makefile.mingw.in: Add rule for make-inline-pixbuf. Use
	gdk-pixbuf's version number in the rule for makefile.mingw itself.

	* gdk_pixbuf.def: Add new entry points.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 8a85fb836fb8b3058b53f7856cf3d79f54d80077..20339863aa327479cd7dcb2f127e60d3254121a8 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-03  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.mingw.in: Add rule for make-inline-pixbuf. Use
+       gdk-pixbuf's version number in the rule for makefile.mingw itself.
+
+       * gdk_pixbuf.def: Add new entry points.
+
 2000-09-26  Havoc Pennington  <hp@redhat.com>
 
        * gdk-pixbuf-util.c (gdk_pixbuf_saturate_and_pixelate): Add this

diff --git a/gdk-pixbuf/gdk_pixbuf.def b/gdk-pixbuf/gdk_pixbuf.def
index 620b74e7d735107e4daadb23f41ca418f127fa30..ebc499860b203a70c51321dd73051bbf5f86dd48 100644 (file)
--- a/gdk-pixbuf/gdk_pixbuf.def
+++ b/gdk-pixbuf/gdk_pixbuf.def
@@ -34,10 +34,12 @@ EXPORTS
        gdk_pixbuf_new
        gdk_pixbuf_new_from_data
        gdk_pixbuf_new_from_file
+       gdk_pixbuf_new_from_inline
        gdk_pixbuf_new_from_xpm_data
        gdk_pixbuf_postinit
        gdk_pixbuf_preinit
        gdk_pixbuf_ref
+       gdk_pixbuf_saturate_and_pixelate
        gdk_pixbuf_scale
        gdk_pixbuf_scale_simple
        gdk_pixbuf_unref

diff --git a/gdk-pixbuf/makefile.mingw.in b/gdk-pixbuf/makefile.mingw.in
index aaa962f1135c4665b10250d3497ab9c93aa5ddaa..a07b124ba0682a1f2babc85b56dc489dc79c352b 100644 (file)
--- a/gdk-pixbuf/makefile.mingw.in
+++ b/gdk-pixbuf/makefile.mingw.in
@@ -26,6 +26,7 @@ all :                                         \
        pixbufloader-tiff.dll                   \
        pixbufloader-wbmp.dll                   \
        pixbufloader-xpm.dll                    \
+       make-inline-pixbuf.exe                  \
        test-gdk-pixbuf.exe
        
 gdk_pixbuf_OBJECTS =                           \
@@ -105,11 +106,14 @@ pixbufloader_xpm_OBJECTS = io-xpm.o
 pixbufloader-xpm.dll : $(pixbufloader_xpm_OBJECTS) pixbufloader_xpm.def
        $(GLIB)/build-dll pixbufloader-xpm - pixbufloader_xpm.def $(pixbufloader_xpm_OBJECTS) -L  . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS)
 
+make-inline-pixbuf.exe : make-inline-pixbuf.o gdk_pixbuf-$(GDK_PIXBUF_VER).dll
+       $(CC) $(CFLAGS) -o $@ make-inline-pixbuf.o -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GLIB_LIBS)
+
 test-gdk-pixbuf.exe : test-gdk-pixbuf.o gdk_pixbuf-$(GDK_PIXBUF_VER).dll
        $(CC) $(CFLAGS) -o $@ test-gdk-pixbuf.o -L . -lgdk_pixbuf-$(GDK_PIXBUF_VER) $(GTK_LIBS) $(GLIB_LIBS)
 
 # Hack to get an updated makefile.mingw automatically after updating
 # makefile.mingw.in. Only for developer use.
 makefile.mingw: makefile.mingw.in
-       sed -e 's,@GTK_MAJOR[_]VERSION@,@GTK_MAJOR_VERSION@,' \
-           -e 's,@GTK_MINOR[_]VERSION@,@GTK_MINOR_VERSION@,' <$< >$@
+       sed -e 's,@GDK_PIXBUF[_]MAJOR@,@GDK_PIXBUF_MAJOR@,' \
+           -e 's,@GDK_PIXBUF[_]MINOR@,@GDK_PIXBUF_MINOR@,' <$< >$@