diff --git a/ChangeLog b/ChangeLog index 8f0be3ee27..dc4697d1c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2000-08-02 Tor Lillqvist + + * configure.in: Check for . + 2000-08-01 Martin Baulig * gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning() diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8f0be3ee27..dc4697d1c7 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +2000-08-02 Tor Lillqvist + + * configure.in: Check for . + 2000-08-01 Martin Baulig * gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8f0be3ee27..dc4697d1c7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2000-08-02 Tor Lillqvist + + * configure.in: Check for . + 2000-08-01 Martin Baulig * gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning() diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8f0be3ee27..dc4697d1c7 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +2000-08-02 Tor Lillqvist + + * configure.in: Check for . + 2000-08-01 Martin Baulig * gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning() diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8f0be3ee27..dc4697d1c7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2000-08-02 Tor Lillqvist + + * configure.in: Check for . + 2000-08-01 Martin Baulig * gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning() diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8f0be3ee27..dc4697d1c7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2000-08-02 Tor Lillqvist + + * configure.in: Check for . + 2000-08-01 Martin Baulig * gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8f0be3ee27..dc4697d1c7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2000-08-02 Tor Lillqvist + + * configure.in: Check for . + 2000-08-01 Martin Baulig * gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning() diff --git a/configure.in b/configure.in index ae67813d8c..298e32c644 100644 --- a/configure.in +++ b/configure.in @@ -339,6 +339,7 @@ AC_SUBST(GLIB_DEPLIBS) AC_CHECK_HEADERS(dirent.h, AC_DEFINE(HAVE_DIRENT_H)) AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H)) AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H)) +AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H)) saved_cflags="$CFLAGS" saved_ldflags="$LDFLAGS" diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 745578d87d..a63fc9afca 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,14 @@ +2000-08-02 Tor Lillqvist + + * io-bmp.c + * io-ico.c + * io-ras.c + * io-tiff.c + * io-wbmp.c: Conditionalise inclusion of . + + * makefile.mingw.in: List loaders alphabetically. Add the wbmp + one. Fix names of DLLs to have '-' instead of '_'. + 2000-07-31 Elliot Lee * io-wbmp.c: Some bug fixes - now tested to work. diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c index 7d7121b5d4..18ef7bc904 100644 --- a/gdk-pixbuf/io-bmp.c +++ b/gdk-pixbuf/io-bmp.c @@ -33,7 +33,9 @@ Known bugs: #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include "gdk-pixbuf-private.h" #include "gdk-pixbuf-io.h" diff --git a/gdk-pixbuf/io-ico.c b/gdk-pixbuf/io-ico.c index b307631e06..83e2cf93bd 100644 --- a/gdk-pixbuf/io-ico.c +++ b/gdk-pixbuf/io-ico.c @@ -35,7 +35,9 @@ Known bugs: #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include "gdk-pixbuf-private.h" #include "gdk-pixbuf-io.h" diff --git a/gdk-pixbuf/io-ras.c b/gdk-pixbuf/io-ras.c index a636ede37d..e70f4c9e0d 100644 --- a/gdk-pixbuf/io-ras.c +++ b/gdk-pixbuf/io-ras.c @@ -32,7 +32,9 @@ Known bugs: #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include "gdk-pixbuf-private.h" #include "gdk-pixbuf-io.h" diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c index 0b2046c87b..7209d958f3 100644 --- a/gdk-pixbuf/io-tiff.c +++ b/gdk-pixbuf/io-tiff.c @@ -28,7 +28,9 @@ #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include "gdk-pixbuf-private.h" #include "gdk-pixbuf-io.h" diff --git a/gdk-pixbuf/io-wbmp.c b/gdk-pixbuf/io-wbmp.c index d49658930b..5e08d6bad3 100644 --- a/gdk-pixbuf/io-wbmp.c +++ b/gdk-pixbuf/io-wbmp.c @@ -30,7 +30,9 @@ Known bugs: #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include "gdk-pixbuf-private.h" #include "gdk-pixbuf-io.h" diff --git a/gdk-pixbuf/makefile.mingw.in b/gdk-pixbuf/makefile.mingw.in index dbc774a21c..1f375ac7d7 100644 --- a/gdk-pixbuf/makefile.mingw.in +++ b/gdk-pixbuf/makefile.mingw.in @@ -16,15 +16,16 @@ DEPCFLAGS = $(GLIB_CFLAGS) all : \ ../config.h \ gdk_pixbuf-$(GTK_VER).dll \ - pixbufloader_png.dll \ - pixbufloader_jpeg.dll \ - pixbufloader_gif.dll \ - pixbufloader_ico.dll \ - pixbufloader_ras.dll \ - pixbufloader_tiff.dll \ - pixbufloader_xpm.dll \ - pixbufloader_pnm.dll \ - pixbufloader_bmp.dll \ + pixbufloader-bmp.dll \ + pixbufloader-gif.dll \ + pixbufloader-ico.dll \ + pixbufloader-jpeg.dll \ + pixbufloader-png.dll \ + pixbufloader-pnm.dll \ + pixbufloader-ras.dll \ + pixbufloader-tiff.dll \ + pixbufloader-wbmp.dll \ + pixbufloader-xpm.dll \ test-gdk-pixbuf.exe gdk_pixbuf_OBJECTS = \ @@ -45,59 +46,64 @@ gdk_pixbuf-$(GTK_VER).dll : $(gdk_pixbuf_OBJECTS) gdk_pixbuf.def pixops/libpixops.a : cd pixops && $(MAKE) -f makefile.mingw libpixops.a -pixbufloader_png_OBJECTS = io-png.o +pixbufloader_bmp_OBJECTS = io-bmp.o -pixbufloader_png.dll : $(pixbufloader_png_OBJECTS) pixbufloader_png.def - $(GLIB)/build-dll pixbufloader_png - pixbuf_png.def $(pixbufloader_png_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(PNG_LIBS) +pixbufloader-bmp.dll : $(pixbufloader_bmp_OBJECTS) pixbufloader_bmp.def + $(GLIB)/build-dll pixbufloader-bmp - pixbufloader_bmp.def $(pixbufloader_bmp_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) -io-png.o : io-png.c - $(CC) $(CFLAGS) $(PNG_CFLAGS) -c $< +pixbufloader_gif_OBJECTS = io-gif.o + +pixbufloader-gif.dll : $(pixbufloader_gif_OBJECTS) pixbufloader_gif.def + $(GLIB)/build-dll pixbufloader-gif - pixbufloader_gif.def $(pixbufloader_gif_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) + +pixbufloader_ico_OBJECTS = io-ico.o + +pixbufloader-ico.dll : $(pixbufloader_ico_OBJECTS) pixbufloader_ico.def + $(GLIB)/build-dll pixbufloader-ico - pixbufloader_ico.def $(pixbufloader_ico_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) pixbufloader_jpeg_OBJECTS = io-jpeg.o -pixbufloader_jpeg.dll : $(pixbufloader_jpeg_OBJECTS) pixbufloader_jpeg.def - $(GLIB)/build-dll pixbufloader_jpeg - pixbufloader_jpeg.def $(pixbufloader_jpeg_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(JPEG_LIBS) - io-jpeg.o : io-jpeg.c $(CC) $(CFLAGS) $(JPEG_CFLAGS) -c $< -pixbufloader_gif_OBJECTS = io-gif.o +pixbufloader-jpeg.dll : $(pixbufloader_jpeg_OBJECTS) pixbufloader_jpeg.def + $(GLIB)/build-dll pixbufloader-jpeg - pixbufloader_jpeg.def $(pixbufloader_jpeg_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(JPEG_LIBS) -pixbufloader_gif.dll : $(pixbufloader_gif_OBJECTS) pixbufloader_gif.def - $(GLIB)/build-dll pixbufloader_gif - pixbufloader_gif.def $(pixbufloader_gif_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) +pixbufloader_png_OBJECTS = io-png.o -pixbufloader_ico_OBJECTS = io-ico.o +io-png.o : io-png.c + $(CC) $(CFLAGS) $(PNG_CFLAGS) -c $< -pixbufloader_ico.dll : $(pixbufloader_ico_OBJECTS) pixbufloader_ico.def - $(GLIB)/build-dll pixbufloader_ico - pixbufloader_ico.def $(pixbufloader_ico_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) +pixbufloader-png.dll : $(pixbufloader_png_OBJECTS) pixbufloader_png.def + $(GLIB)/build-dll pixbufloader-png - pixbufloader_png.def $(pixbufloader_png_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(PNG_LIBS) + +pixbufloader_pnm_OBJECTS = io-pnm.o + +pixbufloader-pnm.dll : $(pixbufloader_pnm_OBJECTS) pixbufloader_pnm.def + $(GLIB)/build-dll pixbufloader-pnm - pixbufloader_pnm.def $(pixbufloader_pnm_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) pixbufloader_ras_OBJECTS = io-ras.o -pixbufloader_ras.dll : $(pixbufloader_ras_OBJECTS) pixbufloader_ras.def - $(GLIB)/build-dll pixbufloader_ras - pixbufloader_ras.def $(pixbufloader_ras_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) +pixbufloader-ras.dll : $(pixbufloader_ras_OBJECTS) pixbufloader_ras.def + $(GLIB)/build-dll pixbufloader-ras - pixbufloader_ras.def $(pixbufloader_ras_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) pixbufloader_tiff_OBJECTS = io-tiff.o -pixbufloader_tiff.dll : $(pixbufloader_tiff_OBJECTS) pixbufloader_tiff.def - $(GLIB)/build-dll pixbufloader_tiff - pixbufloader_tiff.def $(pixbufloader_tiff_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) +pixbufloader-tiff.dll : $(pixbufloader_tiff_OBJECTS) pixbufloader_tiff.def + $(GLIB)/build-dll pixbufloader-tiff - pixbufloader_tiff.def $(pixbufloader_tiff_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) io-tiff.o : io-tiff.c $(CC) $(CFLAGS) $(TIFF_CFLAGS) -c $< +pixbufloader_wbmp_OBJECTS = io-wbmp.o + +pixbufloader-wbmp.dll : $(pixbufloader_wbmp_OBJECTS) pixbufloader_wbmp.def + $(GLIB)/build-dll pixbufloader-wbmp - pixbufloader_wbmp.def $(pixbufloader_wbmp_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) + 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-$(GTK_VER) $(GLIB_LIBS) - -pixbufloader_pnm_OBJECTS = io-pnm.o - -pixbufloader_pnm.dll : $(pixbufloader_pnm_OBJECTS) pixbufloader_pnm.def - $(GLIB)/build-dll pixbufloader_pnm - pixbufloader_pnm.def $(pixbufloader_pnm_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) - -pixbufloader_bmp_OBJECTS = io-bmp.o - -pixbufloader_bmp.dll : $(pixbufloader_bmp_OBJECTS) pixbufloader_bmp.def - $(GLIB)/build-dll pixbufloader_bmp - pixbufloader_bmp.def $(pixbufloader_bmp_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) +pixbufloader-xpm.dll : $(pixbufloader_xpm_OBJECTS) pixbufloader_xpm.def + $(GLIB)/build-dll pixbufloader-xpm - pixbufloader_xpm.def $(pixbufloader_xpm_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) test-gdk-pixbuf.exe : test-gdk-pixbuf.o gdk_pixbuf-$(GTK_VER).dll $(CC) $(CFLAGS) -o $@ test-gdk-pixbuf.o -L . -lgdk_pixbuf-$(GTK_VER) $(GTK_LIBS) $(GLIB_LIBS)