Check for mmap.

* configure.in acconfig.h: Check for mmap.

	* modules/colorsel_triangle.c: No need to include gdkx.h. Define
	M_PI if needed.

	* modules/makefile.msc: Use GLib 1.3, update GTk+ paths.
This commit is contained in:
Tor Lillqvist 1999-05-29 01:38:58 +00:00
parent 0457d6914a
commit 392b7d1496
4 changed files with 17 additions and 7 deletions

View File

@ -5,9 +5,9 @@
1999-05-28 Tor Lillqvist <tml@iki.fi>
Merge in Win32 changes to plug-ins. Small Win32-related changes
to app and libgimp.
to app, libgimp and modules.
* configure.in: Check for mmap.
* configure.in acconfig.h: Check for mmap.
* app/makefile.msc: Depend on gimpi.lib.
@ -104,6 +104,12 @@
g_strescape() for strings being passed to Scheme. Some Win32-only
stuff.
* modules/colorsel_triangle.c: No need to include gdkx.h. Define
M_PI if necessary.
* modules/makefile.msc: Update GLib and GTk+ version paths to
current preferences.
Thu May 27 22:04:49 1999 Jay Cox (jaycox@earthlink.net)
* app/channel.c: applied fix for the channel_bounds bug from

View File

@ -22,6 +22,7 @@
#undef HAVE_GETTEXT
#undef HAVE_IPC_H
#undef HAVE_LC_MESSAGES
#undef HAVE_MMAP
#undef HAVE_NDIR_H
#undef HAVE_PROGRESSIVE_JPEG
#undef HAVE_PUTENV

View File

@ -24,11 +24,14 @@
#include <stdio.h>
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <libgimp/color_selector.h>
#include <libgimp/gimpmodule.h>
#include <math.h>
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
/* prototypes */
static GtkWidget * colorsel_triangle_new (int, int, int,

View File

@ -18,13 +18,13 @@ TOUCH = copy makefile.msc+nul
GIMP_VER = 1.1
GTK_VER = 1.3
GLIB_VER = 1.2
GLIB_VER = 1.3
GLIB = ..\..\glib-$(GLIB_VER)
GLIB = ..\..\glib
GMODULE = $(GLIB)\gmodule
GTK = ..\..\gtk-plus
GTK = ..\..\gtk+
CFLAGS = -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)
CFLAGS = -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk\win32 -I$(GTK)
MODULES = colorsel_gtk.dll \
colorsel_triangle.dll