diff options
| author | pesco <pesco> | 2000-12-24 22:53:54 +0000 |
|---|---|---|
| committer | pesco <pesco> | 2000-12-24 22:53:54 +0000 |
| commit | d1ff1f6798b003a820f5de9fad835ff352f31afe (patch) | |
| tree | 63087d7f74fbc3694e375d32c3067fe40675894e /progs/demos/multiarb.c | |
| parent | 05ecec6f49732d8804982cdb350798a9fc7b81d9 (diff) | |
* 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.
Diffstat (limited to 'progs/demos/multiarb.c')
| -rw-r--r-- | progs/demos/multiarb.c | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/progs/demos/multiarb.c b/progs/demos/multiarb.c index aa0beb9bc7..2d730988a1 100644 --- a/progs/demos/multiarb.c +++ b/progs/demos/multiarb.c @@ -1,4 +1,4 @@ -/* $Id: multiarb.c,v 1.7 2000/11/01 16:02:01 brianp Exp $ */ +/* $Id: multiarb.c,v 1.8 2000/12/24 22:53:54 pesco Exp $ */ /* * GL_ARB_multitexture demo @@ -12,6 +12,32 @@ /* * $Log: multiarb.c,v $ + * Revision 1.8 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.7 2000/11/01 16:02:01 brianp * print number of texture units * @@ -51,7 +77,7 @@ #include <string.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_1_FILE "../images/girl.rgb" #define TEXTURE_2_FILE "../images/reflect.rgb" |