From 8525fae3b8276441883604a1ced32a46b85d5adf Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Sun, 23 Nov 2003 10:27:10 +0000
Subject: build fixes, rh9

---
 progs/tests/Makefile.X11 | 7 ++++---
 progs/tests/cva.c        | 3 ++-
 progs/tests/dinoshade.c  | 1 +
 progs/tests/fptexture.c  | 2 +-
 progs/tests/multipal.c   | 3 ++-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/progs/tests/Makefile.X11 b/progs/tests/Makefile.X11
index f568c342c9..b65f0e427d 100644
--- a/progs/tests/Makefile.X11
+++ b/progs/tests/Makefile.X11
@@ -4,8 +4,9 @@
 # distro.  They're not too interesting but they're good for testing.
 
 TOP = ../..
+LIBDIR = $(TOP)/lib
 
-LIBS = $(APP_LIB_DEPS)
+LIBS = -L$(LIBDIR) $(APP_LIB_DEPS)
 
 SOURCES = antialias.c \
 	bufferobj.c \
@@ -74,10 +75,10 @@ texrect: texrect.o readtex.o
 	$(CC) texrect.o readtex.o $(LIBS) -o $@
 
 texrect.o: texrect.c readtex.h
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
 
 readtex.o: readtex.c
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
 
 
 readtex.h: $(TOP)/progs/util/readtex.h
diff --git a/progs/tests/cva.c b/progs/tests/cva.c
index eff35048f3..b596a5a4d3 100644
--- a/progs/tests/cva.c
+++ b/progs/tests/cva.c
@@ -1,4 +1,4 @@
-/* $Id: cva.c,v 1.5 2003/01/28 15:31:35 brianp Exp $ */
+/* $Id: cva.c,v 1.6 2003/11/23 10:27:10 keithw Exp $ */
 
 /*
  * Trivial CVA test, good for testing driver fastpaths (especially
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <malloc.h>	/* for ptrdiff_t, referenced by GL.h when GL_GLEXT_LEGACY defined */
 #ifdef _WIN32
 #include <windows.h>
 #endif
diff --git a/progs/tests/dinoshade.c b/progs/tests/dinoshade.c
index e3086bb3f0..1e4d4abfda 100644
--- a/progs/tests/dinoshade.c
+++ b/progs/tests/dinoshade.c
@@ -38,6 +38,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>       /* for cos(), sin(), and sqrt() */
+#include <malloc.h>	/* for ptrdiff_t, referenced by GL.h when GL_GLEXT_LEGACY defined */
 #ifdef _WIN32
 #include <windows.h>
 #endif
diff --git a/progs/tests/fptexture.c b/progs/tests/fptexture.c
index a62116b320..f57ad62828 100644
--- a/progs/tests/fptexture.c
+++ b/progs/tests/fptexture.c
@@ -8,7 +8,7 @@
 #define GL_GLEXT_PROTOTYPES
 #include <GL/glut.h>
 
-#include "readtex.c"
+#include "../util/readtex.c"
 
 
 #define TEXTURE_FILE "../images/girl.rgb"
diff --git a/progs/tests/multipal.c b/progs/tests/multipal.c
index a2efab874a..9ac5bdf8df 100644
--- a/progs/tests/multipal.c
+++ b/progs/tests/multipal.c
@@ -1,4 +1,4 @@
-/* $Id: multipal.c,v 1.4 2002/10/18 17:47:36 kschultz Exp $ */
+/* $Id: multipal.c,v 1.5 2003/11/23 10:27:10 keithw Exp $ */
 
 /*
  * Test multitexture and paletted textures.
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <malloc.h>	/* for ptrdiff_t, referenced by GL.h when GL_GLEXT_LEGACY defined */
 #ifdef _WIN32
 #include <windows.h>
 #endif
-- 
cgit v1.2.3