diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/Makefile.X11 | 21 | ||||
| -rw-r--r-- | src/mesa/main/Imakefile | 17 | ||||
| -rw-r--r-- | src/mesa/main/Makefile.X11 | 21 | ||||
| -rw-r--r-- | src/mesa/main/descrip.mms | 22 |
4 files changed, 46 insertions, 35 deletions
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11 index 1a56d0ae966..bb383f65540 100644 --- a/src/mesa/Makefile.X11 +++ b/src/mesa/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.21 2000/08/21 14:25:25 brianp Exp $ +# $Id: Makefile.X11,v 1.22 2000/09/07 15:42:13 brianp Exp $ # Mesa 3-D graphics library # Version: 3.5 @@ -106,10 +106,11 @@ DRIVER_SOURCES = \ X/glxapi.c \ X/fakeglx.c \ X/xfonts.c \ - X/xmesa1.c \ - X/xmesa2.c \ - X/xmesa3.c \ - X/xmesa4.c \ + X/xm_api.c \ + X/xm_dd.c \ + X/xm_line.c \ + X/xm_span.c \ + X/xm_tri.c \ OSmesa/osmesa.c \ SVGA/svgamesa.c \ SVGA/svgamesa8.c \ @@ -159,13 +160,15 @@ X/fakeglx.o: X/fakeglx.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ X/xfonts.o: X/xfonts.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/xmesa1.o: X/xmesa1.c +X/xm_api.o: X/xm_api.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/xmesa2.o: X/xmesa2.c +X/xm_dd.o: X/xm_dd.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/xmesa3.o: X/xmesa3.c +X/xm_span.o: X/xm_span.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/xmesa4.o: X/xmesa4.c +X/xm_line.o: X/xm_line.c + $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ +X/xm_tri.o: X/xm_tri.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ SVGA/svgamesa.o: SVGA/svgamesa.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ diff --git a/src/mesa/main/Imakefile b/src/mesa/main/Imakefile index 443e83c8f30..fe0658c6c76 100644 --- a/src/mesa/main/Imakefile +++ b/src/mesa/main/Imakefile @@ -61,9 +61,11 @@ vb.c \ vertex.c \
xfonts.c \
xform.c \
-xmesa1.c \
-xmesa2.c \
-xmesa3.c
+xm_api.c \
+xm_dd.c \
+xm_line.c \
+xm_span.c \
+xm_tri.c
OBJS = \
accum.o \
@@ -113,10 +115,11 @@ vb.o \ vertex.o \
xfonts.o \
xform.o \
-xmesa1.o \
-xmesa2.o \
-xmesa3.o
-xmesa4.o
+xm_api.o \
+xm_dd.o \
+xm_line.o \
+xm_span.o \
+xm_tri.o
LINTLIBS =
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11 index 1a56d0ae966..bb383f65540 100644 --- a/src/mesa/main/Makefile.X11 +++ b/src/mesa/main/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.21 2000/08/21 14:25:25 brianp Exp $ +# $Id: Makefile.X11,v 1.22 2000/09/07 15:42:13 brianp Exp $ # Mesa 3-D graphics library # Version: 3.5 @@ -106,10 +106,11 @@ DRIVER_SOURCES = \ X/glxapi.c \ X/fakeglx.c \ X/xfonts.c \ - X/xmesa1.c \ - X/xmesa2.c \ - X/xmesa3.c \ - X/xmesa4.c \ + X/xm_api.c \ + X/xm_dd.c \ + X/xm_line.c \ + X/xm_span.c \ + X/xm_tri.c \ OSmesa/osmesa.c \ SVGA/svgamesa.c \ SVGA/svgamesa8.c \ @@ -159,13 +160,15 @@ X/fakeglx.o: X/fakeglx.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ X/xfonts.o: X/xfonts.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/xmesa1.o: X/xmesa1.c +X/xm_api.o: X/xm_api.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/xmesa2.o: X/xmesa2.c +X/xm_dd.o: X/xm_dd.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/xmesa3.o: X/xmesa3.c +X/xm_span.o: X/xm_span.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ -X/xmesa4.o: X/xmesa4.c +X/xm_line.o: X/xm_line.c + $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ +X/xm_tri.o: X/xm_tri.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ SVGA/svgamesa.o: SVGA/svgamesa.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms index e532df4c528..b8e0dca709d 100644 --- a/src/mesa/main/descrip.mms +++ b/src/mesa/main/descrip.mms @@ -29,7 +29,7 @@ zoom.c bbox.c cva.c vector.c vbindirect.c config.c enums.c extensions.c \ pipeline.c stages.c state.c vertices.c [.x86]x86.c DRIVER_SOURCES = [.x]glxapi.c [.x]fakeglx.c [.x]xfonts.c \ -[.x]xmesa1.c [.x]xmesa2.c [.x]xmesa3.c [.x]xmesa4.c \ +[.x]xm_api.c [.x]xm_dd.c [.x]xm_line.c [.x]xm_span.c [.x]xm_tri.c \ [.osmesa]osmesa.c \ [.svga]svgamesa.c \ [.fx]fxapi.c [.fx]fxdd.c [.fx]fxddtex.c [.fx]fxvsetup.c [.fx]fxsetup.c \ @@ -61,7 +61,7 @@ OBJECTS6=vbxform.obj,xform.obj,zoom.obj,bbox.obj,cva.obj,vector.obj,vbindirect.o vertices.obj,[.x86]x86.obj OBJECTS2=[.x]glxapi.obj,[.x]fakeglx.obj,[.x]xfonts.obj,\ -[.x]xmesa1.obj,[.x]xmesa2.obj,[.x]xmesa3.obj,[.x]xmesa4.obj,\ +[.x]xm_api.obj,[.x]xm_dd.obj,[.x]xm_line.obj,[.x]xm_span.obj,[.x]xm_tri.obj\ [.osmesa]osmesa.obj,\ [.svga]svgamesa.obj @@ -134,14 +134,16 @@ pixeltex.obj : pixeltex.c $(CC) $(CFLAGS) /obj=[.x]fakeglx.obj [.x]fakeglx.c [.x]xfonts.obj : [.x]xfonts.c $(CC) $(CFLAGS) /obj=[.x]xfonts.obj [.x]xfonts.c -[.x]xmesa1.obj : [.x]xmesa1.c - $(CC) $(CFLAGS) /obj=[.x]xmesa1.obj [.x]xmesa1.c -[.x]xmesa2.obj : [.x]xmesa2.c - $(CC) $(CFLAGS) /obj=[.x]xmesa2.obj [.x]xmesa2.c -[.x]xmesa3.obj : [.x]xmesa3.c - $(CC) $(CFLAGS) /obj=[.x]xmesa3.obj [.x]xmesa3.c -[.x]xmesa4.obj : [.x]xmesa4.c - $(CC) $(CFLAGS) /obj=[.x]xmesa4.obj [.x]xmesa4.c +[.x]xm_api.obj : [.x]xm_api.c + $(CC) $(CFLAGS) /obj=[.x]xm_api.obj [.x]xm_api.c +[.x]xm_dd.obj : [.x]xm_dd.c + $(CC) $(CFLAGS) /obj=[.x]xm_dd.obj [.x]xm_dd.c +[.x]xm_line.obj : [.x]xm_line.c + $(CC) $(CFLAGS) /obj=[.x]xm_line.obj [.x]xm_line.c +[.x]xm_span.obj : [.x]xm_span.c + $(CC) $(CFLAGS) /obj=[.x]xm_span.obj [.x]xm_span.c +[.x]xm_tri.obj : [.x]xm_tri.c + $(CC) $(CFLAGS) /obj=[.x]xm_tri.obj [.x]xm_tri.c [.osmesa]osmesa.obj : [.osmesa]osmesa.c $(CC) $(CFLAGS) /obj=[.osmesa]osmesa.obj [.osmesa]osmesa.c [.svga]svgamesa.obj : [.svga]svgamesa.c |