Commit 7bc2cb6e authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist
Browse files

Check for <unistd.h>.

2000-08-02  Tor Lillqvist  <tml@iki.fi>

	* configure.in: Check for <unistd.h>.

2000-08-02  Tor Lillqvist  <tml@iki.fi>

	* io-bmp.c
	* io-ico.c
	* io-ras.c
	* io-tiff.c
	* io-wbmp.c: Conditionalise inclusion of <unistd.h>.

	* makefile.mingw.in: List loaders alphabetically. Add the wbmp
	one. Fix names of DLLs to have '-' instead of '_'.
parent d0893cc5
2000-08-02 Tor Lillqvist <tml@iki.fi>
* configure.in: Check for <unistd.h>.
2000-08-01 Martin Baulig <baulig@suse.de> 2000-08-01 Martin Baulig <baulig@suse.de>
* gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning() * gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning()
......
2000-08-02 Tor Lillqvist <tml@iki.fi>
* configure.in: Check for <unistd.h>.
2000-08-01 Martin Baulig <baulig@suse.de> 2000-08-01 Martin Baulig <baulig@suse.de>
* gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning() * gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning()
......
2000-08-02 Tor Lillqvist <tml@iki.fi>
* configure.in: Check for <unistd.h>.
2000-08-01 Martin Baulig <baulig@suse.de> 2000-08-01 Martin Baulig <baulig@suse.de>
* gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning() * gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning()
......
2000-08-02 Tor Lillqvist <tml@iki.fi>
* configure.in: Check for <unistd.h>.
2000-08-01 Martin Baulig <baulig@suse.de> 2000-08-01 Martin Baulig <baulig@suse.de>
* gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning() * gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning()
......
2000-08-02 Tor Lillqvist <tml@iki.fi>
* configure.in: Check for <unistd.h>.
2000-08-01 Martin Baulig <baulig@suse.de> 2000-08-01 Martin Baulig <baulig@suse.de>
* gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning() * gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning()
......
2000-08-02 Tor Lillqvist <tml@iki.fi>
* configure.in: Check for <unistd.h>.
2000-08-01 Martin Baulig <baulig@suse.de> 2000-08-01 Martin Baulig <baulig@suse.de>
* gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning() * gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning()
......
2000-08-02 Tor Lillqvist <tml@iki.fi>
* configure.in: Check for <unistd.h>.
2000-08-01 Martin Baulig <baulig@suse.de> 2000-08-01 Martin Baulig <baulig@suse.de>
* gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning() * gtk/gtkmain.c (gtk_init_check): Use g_message() and not g_warning()
......
...@@ -339,6 +339,7 @@ AC_SUBST(GLIB_DEPLIBS) ...@@ -339,6 +339,7 @@ AC_SUBST(GLIB_DEPLIBS)
AC_CHECK_HEADERS(dirent.h, AC_DEFINE(HAVE_DIRENT_H)) AC_CHECK_HEADERS(dirent.h, AC_DEFINE(HAVE_DIRENT_H))
AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_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(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H))
AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H))
saved_cflags="$CFLAGS" saved_cflags="$CFLAGS"
saved_ldflags="$LDFLAGS" saved_ldflags="$LDFLAGS"
......
2000-08-02 Tor Lillqvist <tml@iki.fi>
* io-bmp.c
* io-ico.c
* io-ras.c
* io-tiff.c
* io-wbmp.c: Conditionalise inclusion of <unistd.h>.
* makefile.mingw.in: List loaders alphabetically. Add the wbmp
one. Fix names of DLLs to have '-' instead of '_'.
2000-07-31 Elliot Lee <sopwith@redhat.com> 2000-07-31 Elliot Lee <sopwith@redhat.com>
* io-wbmp.c: Some bug fixes - now tested to work. * io-wbmp.c: Some bug fixes - now tested to work.
......
...@@ -33,7 +33,9 @@ Known bugs: ...@@ -33,7 +33,9 @@ Known bugs:
#include <config.h> #include <config.h>
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif
#include <string.h> #include <string.h>
#include "gdk-pixbuf-private.h" #include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h" #include "gdk-pixbuf-io.h"
......
...@@ -35,7 +35,9 @@ Known bugs: ...@@ -35,7 +35,9 @@ Known bugs:
#include <config.h> #include <config.h>
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif
#include <string.h> #include <string.h>
#include "gdk-pixbuf-private.h" #include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h" #include "gdk-pixbuf-io.h"
......
...@@ -32,7 +32,9 @@ Known bugs: ...@@ -32,7 +32,9 @@ Known bugs:
#include <config.h> #include <config.h>
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif
#include <string.h> #include <string.h>
#include "gdk-pixbuf-private.h" #include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h" #include "gdk-pixbuf-io.h"
......
...@@ -28,7 +28,9 @@ ...@@ -28,7 +28,9 @@
#include <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif
#include <tiffio.h> #include <tiffio.h>
#include "gdk-pixbuf-private.h" #include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h" #include "gdk-pixbuf-io.h"
......
...@@ -30,7 +30,9 @@ Known bugs: ...@@ -30,7 +30,9 @@ Known bugs:
#include <config.h> #include <config.h>
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif
#include <string.h> #include <string.h>
#include "gdk-pixbuf-private.h" #include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-io.h" #include "gdk-pixbuf-io.h"
......
...@@ -16,15 +16,16 @@ DEPCFLAGS = $(GLIB_CFLAGS) ...@@ -16,15 +16,16 @@ DEPCFLAGS = $(GLIB_CFLAGS)
all : \ all : \
../config.h \ ../config.h \
gdk_pixbuf-$(GTK_VER).dll \ gdk_pixbuf-$(GTK_VER).dll \
pixbufloader_png.dll \ pixbufloader-bmp.dll \
pixbufloader_jpeg.dll \ pixbufloader-gif.dll \
pixbufloader_gif.dll \ pixbufloader-ico.dll \
pixbufloader_ico.dll \ pixbufloader-jpeg.dll \
pixbufloader_ras.dll \ pixbufloader-png.dll \
pixbufloader_tiff.dll \ pixbufloader-pnm.dll \
pixbufloader_xpm.dll \ pixbufloader-ras.dll \
pixbufloader_pnm.dll \ pixbufloader-tiff.dll \
pixbufloader_bmp.dll \ pixbufloader-wbmp.dll \
pixbufloader-xpm.dll \
test-gdk-pixbuf.exe test-gdk-pixbuf.exe
gdk_pixbuf_OBJECTS = \ gdk_pixbuf_OBJECTS = \
...@@ -45,59 +46,64 @@ gdk_pixbuf-$(GTK_VER).dll : $(gdk_pixbuf_OBJECTS) gdk_pixbuf.def ...@@ -45,59 +46,64 @@ gdk_pixbuf-$(GTK_VER).dll : $(gdk_pixbuf_OBJECTS) gdk_pixbuf.def
pixops/libpixops.a : pixops/libpixops.a :
cd pixops && $(MAKE) -f makefile.mingw 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 pixbufloader-bmp.dll : $(pixbufloader_bmp_OBJECTS) pixbufloader_bmp.def
$(GLIB)/build-dll pixbufloader_png - pixbuf_png.def $(pixbufloader_png_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(PNG_LIBS) $(GLIB)/build-dll pixbufloader-bmp - pixbufloader_bmp.def $(pixbufloader_bmp_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS)
io-png.o : io-png.c pixbufloader_gif_OBJECTS = io-gif.o
$(CC) $(CFLAGS) $(PNG_CFLAGS) -c $<
pixbufloader_jpeg_OBJECTS = io-jpeg.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_jpeg.dll : $(pixbufloader_jpeg_OBJECTS) pixbufloader_jpeg.def pixbufloader_ico_OBJECTS = io-ico.o
$(GLIB)/build-dll pixbufloader_jpeg - pixbufloader_jpeg.def $(pixbufloader_jpeg_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(JPEG_LIBS)
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
io-jpeg.o : io-jpeg.c io-jpeg.o : io-jpeg.c
$(CC) $(CFLAGS) $(JPEG_CFLAGS) -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_png_OBJECTS = io-png.o
io-png.o : io-png.c
$(CC) $(CFLAGS) $(PNG_CFLAGS) -c $<
pixbufloader_gif.dll : $(pixbufloader_gif_OBJECTS) pixbufloader_gif.def pixbufloader-png.dll : $(pixbufloader_png_OBJECTS) pixbufloader_png.def
$(GLIB)/build-dll pixbufloader_gif - pixbufloader_gif.def $(pixbufloader_gif_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(GLIB)/build-dll pixbufloader-png - pixbufloader_png.def $(pixbufloader_png_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(PNG_LIBS)
pixbufloader_ico_OBJECTS = io-ico.o pixbufloader_pnm_OBJECTS = io-pnm.o
pixbufloader_ico.dll : $(pixbufloader_ico_OBJECTS) pixbufloader_ico.def pixbufloader-pnm.dll : $(pixbufloader_pnm_OBJECTS) pixbufloader_pnm.def
$(GLIB)/build-dll pixbufloader_ico - pixbufloader_ico.def $(pixbufloader_ico_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(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_OBJECTS = io-ras.o
pixbufloader_ras.dll : $(pixbufloader_ras_OBJECTS) pixbufloader_ras.def 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) $(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_OBJECTS = io-tiff.o
pixbufloader_tiff.dll : $(pixbufloader_tiff_OBJECTS) pixbufloader_tiff.def 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) $(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 io-tiff.o : io-tiff.c
$(CC) $(CFLAGS) $(TIFF_CFLAGS) -c $< $(CC) $(CFLAGS) $(TIFF_CFLAGS) -c $<
pixbufloader_xpm_OBJECTS = io-xpm.o pixbufloader_wbmp_OBJECTS = io-wbmp.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 pixbufloader-wbmp.dll : $(pixbufloader_wbmp_OBJECTS) pixbufloader_wbmp.def
$(GLIB)/build-dll pixbufloader_pnm - pixbufloader_pnm.def $(pixbufloader_pnm_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(GLIB)/build-dll pixbufloader-wbmp - pixbufloader_wbmp.def $(pixbufloader_wbmp_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS)
pixbufloader_bmp_OBJECTS = io-bmp.o pixbufloader_xpm_OBJECTS = io-xpm.o
pixbufloader_bmp.dll : $(pixbufloader_bmp_OBJECTS) pixbufloader_bmp.def pixbufloader-xpm.dll : $(pixbufloader_xpm_OBJECTS) pixbufloader_xpm.def
$(GLIB)/build-dll pixbufloader_bmp - pixbufloader_bmp.def $(pixbufloader_bmp_OBJECTS) -L . -lgdk_pixbuf-$(GTK_VER) $(GLIB_LIBS) $(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 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) $(CC) $(CFLAGS) -o $@ test-gdk-pixbuf.o -L . -lgdk_pixbuf-$(GTK_VER) $(GTK_LIBS) $(GLIB_LIBS)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment