Updated the makeinclude and config files to have the standard headers.

Added Carl's Cygnus changes.


git-svn-id: file:///fltk/svn/fltk/trunk@275 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

4 files changed, 335 insertions, 114 deletions

diff --git a/makefiles/config.cygnus b/makefiles/config.cygnus
index a8a5cc758..9be2a4680 100644
--- a/makefiles/config.cygnus
+++ b/makefiles/config.cygnus
@@ -1,50 +1,124 @@
-/* config.h
-   This is a replacement for the file ../config.h which is produced by
-   the GNU configure script on Unix systems.  Most of these symbols
-   cannot be turned on as they will turn on X-specific code.  Some
-   should work, however. */
-
-/* Thickness of FL_UP_BOX and FL_DOWN_BOX.  Current 1,2, and 3 are
-   supported.  3 is the historic fltk look.  2 looks more like windoze
-   (and KDE and Qt).  1 is a plausible future evolution...  Notice
-   that this may be simulated at runtime by redefining the boxtypes
-   using Fl::set_boxtype() */
+/*
+ * "$Id: config.cygnus,v 1.3 1999/02/16 14:28:00 mike Exp $"
+ *
+ * Configuration file for the Fast Light Tool Kit (FLTK).
+ *
+ * Copyright 1998-1999 by Bill Spitzak and others.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ *
+ * Please report all bugs and problems to "FLTK-bugs@easysw.com".
+ */
+
+/*
+ * BORDER_WIDTH:
+ *
+ * Thickness of FL_UP_BOX and FL_DOWN_BOX.  Current 1,2, and 3 are
+ * supported.
+ *
+ * 3 is the historic FLTK look.
+ * 2 is the default and looks like Microsoft Windows, KDE, and Qt.
+ * 1 is a plausible future evolution...
+ *
+ * Note that this may be simulated at runtime by redefining the boxtypes
+ * using Fl::set_boxtype().
+ */
+
 #define BORDER_WIDTH 2
 
-/* Do you have OpenGL?
-   Set this to 0 if you don't plan to use OpenGL, and fltk will be smaller */
+/*
+ * HAVE_GL:
+ *
+ * Do you have OpenGL? Set this to 0 if you don't have or plan to use
+ * OpenGL, and FLTK will be smaller.
+ */
+
 #define HAVE_GL 1
-/* Turn this on if your GL card has overlay hardware: */
-#define HAVE_GL_OVERLAY 1
-
-/* Turning this on causes fltk to use it's own palette on 8-bit displays.
-   Currently the result is similar to the X version with Fl::own_colormap,
-   in that it may produce colormap flashing if only one palette is
-   supported at a time (I could not test this because my driver supports
-   a very large number of palettes!).
-   Current bugs:
-    Fl::set_color() does not work after first window shown()
-    Probably causes colormap flashing.
-   Turning this off will save a chunk of code, and it will still "sort of"
-   work on an 8-bit display (you get dithering) */
+
+/*
+ * USE_COLORMAP:
+ *
+ * Setting this to zero will save a good deal of code (especially for
+ * fl_draw_image), but FLTK will only work on TrueColor visuals.
+ */
+
 #define USE_COLORMAP 1
 
-/* X specific, leave off: */
+/*
+ * HAVE_XDBE:
+ *
+ * Do we have the X double-buffer extension?
+ */
+
 #define HAVE_XDBE 0
-#define USE_XDBE 0
 
-/* X specific, leave off: */
+/*
+ * USE_XDBE:
+ *
+ * Actually try to use the double-buffer extension?  Set this to zero
+ * disable use of XDBE without breaking the list_visuals program.
+ */
+
+#define USE_XDBE HAVE_XDBE
+
+/*
+ * HAVE_OVERLAY:
+ *
+ * Use the X overlay extension?  FLTK will try to use an overlay
+ * visual for Fl_Overlay_Window, the Gl_Window overlay, and for the
+ * menus.  Setting this to zero will remove a substantial amount of
+ * code from FLTK.  Overlays have only been tested on SGI servers!
+ */
+
 #define HAVE_OVERLAY 0
 
-/* Byte order of your machine: (not used by win32 code) */
+/*
+ * HAVE_GL_OVERLAY:
+ *
+ * It is possible your GL has an overlay even if X does not.  If so,
+ * set this to 1.
+ */
+
+#define HAVE_GL_OVERLAY HAVE_OVERLAY
+
+/*
+ * WORDS_BIGENDIAN:
+ *
+ * Byte order of your machine: 1 = big-endian, 0 = little-endian.
+ */
+
 #define WORDS_BIGENDIAN 0
 
-/* Types that are 32 bits and 16 bits long.  Used by fl_draw_image only: */
+/*
+ * U16, U32, U64:
+ *
+ * Types used by fl_draw_image.  One of U32 or U64 must be defined.
+ * U16 is optional but FLTK will work better with it!
+ */
+
 #define U16 unsigned short
 #define U32 unsigned
 /* #undef U64 */
 
-/* Where is <dirent.h> (used only by fl_file_chooser and scandir): */
+/*
+ * HAVE_DIRENT_H, HAVE_SYS_NDIR_H, HAVE_SYS_DIR_H, HAVE_NDIR_H, HAVE_SCANDIR:
+ *
+ * Where is <dirent.h> (used only by fl_file_chooser and scandir).
+ */
+
 #define HAVE_DIRENT_H 1
 #define HAVE_SYS_NDIR_H 0
 #define HAVE_SYS_DIR_H 0
@@ -60,9 +134,29 @@
 #define HAVE_VSPRINTF 0
 
 /*
+ * HAVE_SYS_SELECT_H:
+ *
+ * Whether or not select() call has its own header file.
+ */
+
+#define HAVE_SYS_SELECT 0
+
+/*
+ * HAVE_POLL:
+ *
+ * Use poll() if we don't have select().
+ */
+
+#define HAVE_POLL 0
+
+/*
  * HAVE_LIBJPEG
  *
  * Do we have the JPEG group's JPEG file library?
  */
 
 #define HAVE_LIBJPEG 0
+
+/*
+ * End of "$Id: config.cygnus,v 1.3 1999/02/16 14:28:00 mike Exp $".
+ */
diff --git a/makefiles/config.mingw32 b/makefiles/config.mingw32
index a8a5cc758..e37e91d51 100644
--- a/makefiles/config.mingw32
+++ b/makefiles/config.mingw32
@@ -1,50 +1,124 @@
-/* config.h
-   This is a replacement for the file ../config.h which is produced by
-   the GNU configure script on Unix systems.  Most of these symbols
-   cannot be turned on as they will turn on X-specific code.  Some
-   should work, however. */
-
-/* Thickness of FL_UP_BOX and FL_DOWN_BOX.  Current 1,2, and 3 are
-   supported.  3 is the historic fltk look.  2 looks more like windoze
-   (and KDE and Qt).  1 is a plausible future evolution...  Notice
-   that this may be simulated at runtime by redefining the boxtypes
-   using Fl::set_boxtype() */
+/*
+ * "$Id: config.mingw32,v 1.3 1999/02/16 14:28:00 mike Exp $"
+ *
+ * Configuration file for the Fast Light Tool Kit (FLTK).
+ *
+ * Copyright 1998-1999 by Bill Spitzak and others.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ *
+ * Please report all bugs and problems to "FLTK-bugs@easysw.com".
+ */
+
+/*
+ * BORDER_WIDTH:
+ *
+ * Thickness of FL_UP_BOX and FL_DOWN_BOX.  Current 1,2, and 3 are
+ * supported.
+ *
+ * 3 is the historic FLTK look.
+ * 2 is the default and looks like Microsoft Windows, KDE, and Qt.
+ * 1 is a plausible future evolution...
+ *
+ * Note that this may be simulated at runtime by redefining the boxtypes
+ * using Fl::set_boxtype().
+ */
+
 #define BORDER_WIDTH 2
 
-/* Do you have OpenGL?
-   Set this to 0 if you don't plan to use OpenGL, and fltk will be smaller */
+/*
+ * HAVE_GL:
+ *
+ * Do you have OpenGL? Set this to 0 if you don't have or plan to use
+ * OpenGL, and FLTK will be smaller.
+ */
+
 #define HAVE_GL 1
-/* Turn this on if your GL card has overlay hardware: */
-#define HAVE_GL_OVERLAY 1
-
-/* Turning this on causes fltk to use it's own palette on 8-bit displays.
-   Currently the result is similar to the X version with Fl::own_colormap,
-   in that it may produce colormap flashing if only one palette is
-   supported at a time (I could not test this because my driver supports
-   a very large number of palettes!).
-   Current bugs:
-    Fl::set_color() does not work after first window shown()
-    Probably causes colormap flashing.
-   Turning this off will save a chunk of code, and it will still "sort of"
-   work on an 8-bit display (you get dithering) */
+
+/*
+ * USE_COLORMAP:
+ *
+ * Setting this to zero will save a good deal of code (especially for
+ * fl_draw_image), but FLTK will only work on TrueColor visuals.
+ */
+
 #define USE_COLORMAP 1
 
-/* X specific, leave off: */
+/*
+ * HAVE_XDBE:
+ *
+ * Do we have the X double-buffer extension?
+ */
+
 #define HAVE_XDBE 0
-#define USE_XDBE 0
 
-/* X specific, leave off: */
+/*
+ * USE_XDBE:
+ *
+ * Actually try to use the double-buffer extension?  Set this to zero
+ * disable use of XDBE without breaking the list_visuals program.
+ */
+
+#define USE_XDBE HAVE_XDBE
+
+/*
+ * HAVE_OVERLAY:
+ *
+ * Use the X overlay extension?  FLTK will try to use an overlay
+ * visual for Fl_Overlay_Window, the Gl_Window overlay, and for the
+ * menus.  Setting this to zero will remove a substantial amount of
+ * code from FLTK.  Overlays have only been tested on SGI servers!
+ */
+
 #define HAVE_OVERLAY 0
 
-/* Byte order of your machine: (not used by win32 code) */
+/*
+ * HAVE_GL_OVERLAY:
+ *
+ * It is possible your GL has an overlay even if X does not.  If so,
+ * set this to 1.
+ */
+
+#define HAVE_GL_OVERLAY HAVE_OVERLAY
+
+/*
+ * WORDS_BIGENDIAN:
+ *
+ * Byte order of your machine: 1 = big-endian, 0 = little-endian.
+ */
+
 #define WORDS_BIGENDIAN 0
 
-/* Types that are 32 bits and 16 bits long.  Used by fl_draw_image only: */
+/*
+ * U16, U32, U64:
+ *
+ * Types used by fl_draw_image.  One of U32 or U64 must be defined.
+ * U16 is optional but FLTK will work better with it!
+ */
+
 #define U16 unsigned short
 #define U32 unsigned
 /* #undef U64 */
 
-/* Where is <dirent.h> (used only by fl_file_chooser and scandir): */
+/*
+ * HAVE_DIRENT_H, HAVE_SYS_NDIR_H, HAVE_SYS_DIR_H, HAVE_NDIR_H, HAVE_SCANDIR:
+ *
+ * Where is <dirent.h> (used only by fl_file_chooser and scandir).
+ */
+
 #define HAVE_DIRENT_H 1
 #define HAVE_SYS_NDIR_H 0
 #define HAVE_SYS_DIR_H 0
@@ -60,9 +134,29 @@
 #define HAVE_VSPRINTF 0
 
 /*
+ * HAVE_SYS_SELECT_H:
+ *
+ * Whether or not select() call has its own header file.
+ */
+
+#define HAVE_SYS_SELECT 0
+
+/*
+ * HAVE_POLL:
+ *
+ * Use poll() if we don't have select().
+ */
+
+#define HAVE_POLL 0
+
+/*
  * HAVE_LIBJPEG
  *
  * Do we have the JPEG group's JPEG file library?
  */
 
 #define HAVE_LIBJPEG 0
+
+/*
+ * End of "$Id: config.mingw32,v 1.3 1999/02/16 14:28:00 mike Exp $".
+ */
diff --git a/makefiles/makeinclude.cygnus b/makefiles/makeinclude.cygnus
index 3ff44feac..053115ced 100644
--- a/makefiles/makeinclude.cygnus
+++ b/makefiles/makeinclude.cygnus
@@ -1,38 +1,51 @@
-# !!!! YOU PROBABLY WANT TO USE makeinclude.mingw32 INSTEAD !!!!
-
-# Makeinclude file for the Cygwin B19 release of GCC for Windoze
-#
-# This will try to use Cygwin's Unix emulation as much as possible,
-# which means it will link in Cygwin's libraries.  This seems to
-# result in much slower performance, and the only real difference
-# is that the file chooser uses cygwin's scandir implementation
-# rather than my own.  To compile with direct windoze calls
-# use the file makeinclude.mingw32.
-
-# Copy this file to .. and run make.
-# Thanks to Philipp Knirsch at Lucent and Carl Thompson
+#
+# "$Id: makeinclude.cygnus,v 1.6 1999/02/16 14:28:01 mike Exp $"
+#
+# Make include file for the Fast Light Tool Kit (FLTK).
+#
+# Copyright 1998-1999 by Bill Spitzak and others.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+#
+# Please report all bugs and problems to "fltk-bugs@easysw.com".
+#
 
-prefix          =/usr/local
-exec_prefix     =${prefix}
-bindir          =${exec_prefix}/bin
-includedir      =${prefix}/include
-libdir          =${exec_prefix}/lib
-srcdir          =.
+prefix          = /usr/local
+exec_prefix     = ${prefix}
+bindir          = ${exec_prefix}/bin
+includedir      = ${prefix}/include
+libdir          = ${exec_prefix}/lib
+srcdir          = .
 
 # compiler names:
-CXX     =g++
-CC      =gcc
+CXX		= g++
+CC		= gcc
 
 # flags for C++ compiler:
-CFLAGS          =-Wall -O2 -DCYGNUS
-CXXFLAGS        =-Wall -O2 -DCYGNUS
+CFLAGS		= -Wall -O2 -DCYGNUS -DWIN32 -mno-cygwin -mwindows
+CXXFLAGS	= -Wall -O2 -DCYGNUS -DWIN32 -mno-cygwin -mwindows
 
 # program to make the archive:
-LIBNAME         =libfltk.a
-LIBCOMMAND      =ar -ruv
-RANLIB          =ranlib
+LIBNAME		= libfltk.a
+LIBCOMMAND	= ar -ruv
+RANLIB		= ranlib
 
 # libraries to link with:
-LDLIBS  =-lgdi32 -luser32 -lglu32 -lopengl32 -lmsvcrt -lwsock32 -lm
+LDLIBS		= -lgdi32 -luser32 -lglu32 -lopengl32 -lmsvcrt -lwsock32 -lm
 
-INSTALL =/CYGNUS/B19/H-I386~1/BIN/install -c
+#
+# End of "$Id: makeinclude.cygnus,v 1.6 1999/02/16 14:28:01 mike Exp $".
+#
diff --git a/makefiles/makeinclude.mingw32 b/makefiles/makeinclude.mingw32
index 5919c10cb..fefba91a3 100644
--- a/makefiles/makeinclude.mingw32
+++ b/makefiles/makeinclude.mingw32
@@ -1,31 +1,51 @@
-# Makeinclude file for the Cygwin B19 release of GCC for Windoze
-
-# This will compile the code to directly call Windows interfaces
-# and does not use the CYGWIN library.
-
-# Thanks to Philipp Knirsch at Lucent and Carl Thompson
-
-prefix          =/usr/local
-exec_prefix     =${prefix}
-bindir          =${exec_prefix}/bin
-includedir      =${prefix}/include
-libdir          =${exec_prefix}/lib
-srcdir          =.
+#
+# "$Id: makeinclude.mingw32,v 1.7 1999/02/16 14:28:01 mike Exp $"
+#
+# Make include file for the Fast Light Tool Kit (FLTK).
+#
+# Copyright 1998-1999 by Bill Spitzak and others.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+#
+# Please report all bugs and problems to "fltk-bugs@easysw.com".
+#
+
+prefix          = /usr/local
+exec_prefix     = ${prefix}
+bindir          = ${exec_prefix}/bin
+includedir      = ${prefix}/include
+libdir          = ${exec_prefix}/lib
+srcdir          = .
 
 # compiler names:
-CXX     =g++
-CC      =gcc
+CXX		= g++
+CC		= gcc
 
 # flags for C++ compiler:
-CFLAGS          =-Wall -O2 -DWIN32
-CXXFLAGS        =-Wall -O2 -DWIN32
+CFLAGS		= -Wall -O2 -DWIN32 -mwindows
+CXXFLAGS	= -Wall -O2 -DWIN32 -mwindows
 
 # program to make the archive:
-LIBNAME         =libfltk.a
-LIBCOMMAND      =ar -ruv
-RANLIB          =ranlib
+LIBNAME		= libfltk.a
+LIBCOMMAND	= ar -ruv
+RANLIB		= ranlib
 
 # libraries to link with:
-LDLIBS  =-lgdi32 -luser32 -lglu32 -lopengl32 -lmsvcrt -lwsock32 -lm -mwindows
+LDLIBS		= -lgdi32 -luser32 -lglu32 -lopengl32 -lmsvcrt -lwsock32 -lm
 
-INSTALL =/CYGNUS/B19/H-I386~1/BIN/install -c
+#
+# End of "$Id: makeinclude.mingw32,v 1.7 1999/02/16 14:28:01 mike Exp $".
+#