From 74b493a5e61237de081a438e774e5d8139d4c6b7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 24 Jan 2001 00:04:58 +0000
Subject: Lots of GLchan datatype changes. Added GLvector4us datatype in
 math/m_vector.[ch] Added _math_trans_4us() in math/m_translate.[ch] Choose
 GLvector4ub, GLvector4us, GLvector4f at compile time based on CHAN_BITS. Made
 Driver.ClearColor() and Driver.ClearIndex() optional driver functions.
 Changed args to Driver.ClearColor(), updated drivers. Reordered files in
 Makefile.X11

---
 src/mesa/main/Makefile.X11 | 64 +++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'src/mesa/main/Makefile.X11')

diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index fbf8d20999..afcffbb6cc 100644
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.39 2001/01/08 21:55:59 keithw Exp $
+# $Id: Makefile.X11,v 1.40 2001/01/24 00:04:58 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.5
@@ -86,6 +86,35 @@ CORE_SOURCES = \
 	X86/common_x86.c \
 	X86/3dnow.c \
 	X86/katmai.c \
+	swrast/s_aaline.c \
+	swrast/s_aatriangle.c \
+	swrast/s_accum.c \
+	swrast/s_alpha.c \
+	swrast/s_alphabuf.c \
+	swrast/s_bitmap.c \
+	swrast/s_blend.c \
+	swrast/s_buffers.c \
+	swrast/s_copypix.c \
+	swrast/s_context.c \
+	swrast/s_depth.c \
+	swrast/s_drawpix.c \
+	swrast/s_feedback.c \
+	swrast/s_fog.c \
+	swrast/s_histogram.c \
+	swrast/s_lines.c \
+	swrast/s_logic.c \
+	swrast/s_masking.c \
+	swrast/s_pb.c \
+	swrast/s_pixeltex.c \
+	swrast/s_points.c \
+	swrast/s_quads.c \
+	swrast/s_readpix.c \
+	swrast/s_scissor.c \
+	swrast/s_span.c \
+	swrast/s_stencil.c \
+	swrast/s_texture.c \
+	swrast/s_triangle.c \
+	swrast/s_zoom.c \
 	swrast_setup/ss_context.c \
 	swrast_setup/ss_triangle.c \
 	swrast_setup/ss_vb.c \
@@ -119,36 +148,7 @@ CORE_SOURCES = \
 	tnl/t_vb_render.c \
 	tnl/t_vb_texgen.c \
 	tnl/t_vb_texmat.c \
-	tnl/t_vb_vertex.c \
-	swrast/s_aaline.c \
-	swrast/s_aatriangle.c \
-	swrast/s_accum.c \
-	swrast/s_alpha.c \
-	swrast/s_alphabuf.c \
-	swrast/s_bitmap.c \
-	swrast/s_blend.c \
-	swrast/s_buffers.c \
-	swrast/s_copypix.c \
-	swrast/s_context.c \
-	swrast/s_depth.c \
-	swrast/s_drawpix.c \
-	swrast/s_feedback.c \
-	swrast/s_fog.c \
-	swrast/s_histogram.c \
-	swrast/s_lines.c \
-	swrast/s_logic.c \
-	swrast/s_masking.c \
-	swrast/s_pb.c \
-	swrast/s_pixeltex.c \
-	swrast/s_points.c \
-	swrast/s_quads.c \
-	swrast/s_readpix.c \
-	swrast/s_scissor.c \
-	swrast/s_span.c \
-	swrast/s_stencil.c \
-	swrast/s_texture.c \
-	swrast/s_triangle.c \
-	swrast/s_zoom.c 
+	tnl/t_vb_vertex.c
 
 
 DRIVER_SOURCES = \
@@ -188,8 +188,8 @@ ASM_SOURCES =
 ADDITIONAL_OBJ = 
 
 OBJECTS = $(ASM_SOURCES:.S=.o) \
-	$(DRIVER_SOURCES:.c=.o) \
 	$(CORE_SOURCES:.c=.o) \
+	$(DRIVER_SOURCES:.c=.o) \
 	$(ADDITIONAL_OBJ)
 
 
-- 
cgit v1.2.3