summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralanh <alanh>2000-09-04 16:41:46 +0000
committeralanh <alanh>2000-09-04 16:41:46 +0000
commit6ba282c42965d504cbb5c7066a370134f554ef4c (patch)
tree97296c8d7ea77ba4613f128eb47345451b1b27f9
parentbb54ac28aec6690fc84c0a2b940e8ae2186aab8d (diff)
Merge Imakefile from HEAD branch.tdfx-2-1-20000905-freeze
-rw-r--r--xc/lib/GL/mesa/src/drv/tdfx/Imakefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/xc/lib/GL/mesa/src/drv/tdfx/Imakefile b/xc/lib/GL/mesa/src/drv/tdfx/Imakefile
index 494ad2f66..ea80d8e4f 100644
--- a/xc/lib/GL/mesa/src/drv/tdfx/Imakefile
+++ b/xc/lib/GL/mesa/src/drv/tdfx/Imakefile
@@ -1,3 +1,4 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/tdfx/Imakefile,v 1.10 2000/08/04 03:51:44 tsi Exp $
#include <Threads.tmpl>
@@ -47,7 +48,7 @@ MESA_INCLUDES = -I. -I.. -I../../include
HIOBJS = ../../../../highpc.o
LOOBJS = ../../../../lowpc.o
#else
- HIOBJS =
+ HIOBJS =
LOOBJS =
#endif
@@ -134,8 +135,7 @@ MESA_INCLUDES = -I. -I.. -I../../include
../../vertices.c \
../../winpos.c \
../../xform.c \
- ../../zoom.c \
- ../../X86/common_x86.c
+ ../../zoom.c
MESAOBJS = ../../aatriangle.o \
../../accum.o \