summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/Makefile.X11
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2000-11-24 15:21:59 +0000
committerKeith Whitwell <[email protected]>2000-11-24 15:21:59 +0000
commit9aff6cfdc37f83a2528463179ad0b50893bf0c58 (patch)
tree0bb5482717e276ab6b95b47ba2eb3ff8685094bf /src/mesa/main/Makefile.X11
parent65dcc30599348c2bfd7952b888db27edd1670fc6 (diff)
Fixed a couple of bugs that crept into last commit
- Eval not compiled correctly - Material colors computed incorrectly Reworked the VERT_TEX flags, now support upto 12 texture units in tnl.
Diffstat (limited to 'src/mesa/main/Makefile.X11')
-rw-r--r--src/mesa/main/Makefile.X114
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index 84384f4c81e..00debd391d1 100644
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.34 2000/11/24 10:25:05 keithw Exp $
+# $Id: Makefile.X11,v 1.35 2000/11/24 15:21:59 keithw Exp $
# Mesa 3-D graphics library
# Version: 3.5
@@ -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)