diff --git a/FL/glu.h b/FL/glu.h new file mode 100644 index 000000000..b6409ae72 --- /dev/null +++ b/FL/glu.h @@ -0,0 +1,60 @@ +// +// "$Id:$" +// +// GLu header file for the Fast Light Tool Kit (FLTK). +// +// Copyright 1998-2006 by Bill Spitzak and others. +// +// You must include this instead of GL/gl.h to get the Microsoft +// APIENTRY stuff included (from ) prior to the OpenGL +// header files. +// +// This file also provides "missing" OpenGL functions, and +// gl_start() and gl_finish() to allow OpenGL to be used in any window +// +// 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 on the following page: +// +// http://www.fltk.org/str.php +// + +#ifndef FL_glu_H +# define FL_glu_H + +# include "Enumerations.H" // for color names +# ifdef WIN32 +# include +# endif +# ifndef APIENTRY +# if defined(__CYGWIN__) +# define APIENTRY __attribute__ ((__stdcall__)) +# else +# define APIENTRY +# endif +# endif + +# ifdef __APPLE__ +# include +# else +# include +# endif + +#endif // !FL_glu_H + +// +// End of "$Id: $". +// diff --git a/test/fractals.cxx b/test/fractals.cxx index 8eea74504..efc47777e 100644 --- a/test/fractals.cxx +++ b/test/fractals.cxx @@ -64,11 +64,7 @@ int main(int, char**) { */ #include -#ifdef __APPLE__ -# include -#else -# include // added for FLTK -#endif +#include #include #include diff --git a/test/fracviewer.cxx b/test/fracviewer.cxx index 3a4520608..8e9ab8771 100644 --- a/test/fracviewer.cxx +++ b/test/fracviewer.cxx @@ -16,11 +16,7 @@ #if HAVE_GL && HAVE_GL_GLU_H # include -# ifdef __APPLE__ -# include -# else -# include // added for FLTK -# endif +# include # include # include diff --git a/test/glpuzzle.cxx b/test/glpuzzle.cxx index fe84bccc0..fd4d56344 100644 --- a/test/glpuzzle.cxx +++ b/test/glpuzzle.cxx @@ -47,11 +47,7 @@ int main(int, char**) { #include #include #include // changed for fltk -#ifdef __APPLE__ -# include -#else -# include // added for fltk -#endif +#include // added for fltk #include "trackball.c" // changed from trackball.h for fltk #define WIDTH 4