diff options
Diffstat (limited to 'progs/demos/texcyl.c')
-rw-r--r-- | progs/demos/texcyl.c | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/progs/demos/texcyl.c b/progs/demos/texcyl.c index a0e6224999..30aded2b3e 100644 --- a/progs/demos/texcyl.c +++ b/progs/demos/texcyl.c @@ -1,4 +1,4 @@ -/* $Id: texcyl.c,v 1.3 2000/09/29 23:09:39 brianp Exp $ */ +/* $Id: texcyl.c,v 1.4 2000/12/24 22:53:54 pesco Exp $ */ /* * Textured cylinder demo: lighting, texturing, reflection mapping. @@ -12,6 +12,32 @@ /* * $Log: texcyl.c,v $ + * Revision 1.4 2000/12/24 22:53:54 pesco + * * demos/Makefile.am (INCLUDES): Added -I$(top_srcdir)/util. + * * demos/Makefile.X11, demos/Makefile.BeOS-R4, demos/Makefile.cygnus: + * Essentially the same. + * Program files updated to include "readtex.c", not "../util/readtex.c". + * * demos/reflect.c: Likewise for "showbuffer.c". + * + * + * * Makefile.am (EXTRA_DIST): Added top-level regular files. + * + * * include/GL/Makefile.am (INC_X11): Added glxext.h. + * + * + * * src/GGI/include/ggi/mesa/Makefile.am (EXTRA_HEADERS): Include + * Mesa GGI headers in dist even if HAVE_GGI is not given. + * + * * configure.in: Look for GLUT and demo source dirs in $srcdir. + * + * * src/swrast/Makefile.am (libMesaSwrast_la_SOURCES): Set to *.[ch]. + * More source list updates in various Makefile.am's. + * + * * Makefile.am (dist-hook): Remove CVS directory from distribution. + * (DIST_SUBDIRS): List all possible subdirs here. + * (SUBDIRS): Only list subdirs selected for build again. + * The above two applied to all subdir Makefile.am's also. + * * Revision 1.3 2000/09/29 23:09:39 brianp * added fps output * @@ -41,7 +67,7 @@ #include <math.h> #include <GL/glut.h> -#include "../util/readtex.c" /* I know, this is a hack. */ +#include "readtex.c" /* I know, this is a hack. */ #define TEXTURE_FILE "../images/reflect.rgb" |