summaryrefslogtreecommitdiffstats
path: root/progs/demos/pixeltex.c
diff options
context:
space:
mode:
authorpesco <pesco>2000-12-24 22:53:54 +0000
committerpesco <pesco>2000-12-24 22:53:54 +0000
commitd1ff1f6798b003a820f5de9fad835ff352f31afe (patch)
tree63087d7f74fbc3694e375d32c3067fe40675894e /progs/demos/pixeltex.c
parent05ecec6f49732d8804982cdb350798a9fc7b81d9 (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/pixeltex.c')
-rw-r--r--progs/demos/pixeltex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/demos/pixeltex.c b/progs/demos/pixeltex.c
index 4516b3f8631..96e46ef9294 100644
--- a/progs/demos/pixeltex.c
+++ b/progs/demos/pixeltex.c
@@ -56,7 +56,7 @@
#include <string.h>
#include <GL/glut.h>
#include <GL/glext.h>
-#include "../util/readtex.c" /* I know, this is a hack. */
+#include "readtex.c" /* I know, this is a hack. */
#define TEXTURE_FILE "../images/girl.rgb"