updated for old tessellator, GLU 1.1 versioning

4 files changed, 16 insertions, 48 deletions

diff --git a/src/glu/mesa/Makefile.BeOS b/src/glu/mesa/Makefile.BeOS
index e8851dea44..6fc31738e6 100644
--- a/src/glu/mesa/Makefile.BeOS
+++ b/src/glu/mesa/Makefile.BeOS
@@ -2,8 +2,8 @@
 # Tinic Uro <5uro@informatik.uni-hamburg.de>
 
 # Mesa 3-D graphics library
-# Version:  2.6
-# Copyright (C) 1995-1997  Brian Paul
+# Version:  3.2.1
+# Copyright (C) 1995-2000  Brian Paul
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -29,8 +29,7 @@ INCDIR = ../include
 LIBDIR = ../lib
 
 SOURCES = glu.c mipmap.c nurbs.c nurbscrv.c nurbssrf.c nurbsutl.c \
-	project.c quadric.c tess.c tess_fist.c tess_hash.c tess_heap.c \
-	tess_winding.c tess_clip.c
+	polytest.c project.c quadric.c tess.c tesselat.c
 
 OBJECTS = $(SOURCES:.c=.o)
 
diff --git a/src/glu/mesa/Makefile.BeOS-R4 b/src/glu/mesa/Makefile.BeOS-R4
index 2e4b6db40d..1d6ce82610 100644
--- a/src/glu/mesa/Makefile.BeOS-R4
+++ b/src/glu/mesa/Makefile.BeOS-R4
@@ -1,8 +1,8 @@
 # Makefile for GLU for BeOS R4
 
 # Mesa 3-D graphics library
-# Version:  3.1
-# Copyright (C) 1995-1999  Brian Paul
+# Version:  3.2.1
+# Copyright (C) 1995-2000  Brian Paul
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -19,40 +19,11 @@
 # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-# $Id: Makefile.BeOS-R4,v 1.5.2.1 1999/11/15 21:15:43 gareth Exp $
-
-# $Log: Makefile.BeOS-R4,v $
-# Revision 1.5.2.1  1999/11/15 21:15:43  gareth
-# Added new tessellation polygon clipping file tess_clip.c
-#
-# Revision 1.5  1999/10/03 00:53:38  gareth
-# Added tessellation winding rule files.
-#
-# Revision 1.4  1999/09/17 00:06:57  brianp
-# version symbol changes
-#
-# Revision 1.3  1999/09/15 15:11:01  brianp
-# added third, tiny version number to mklib scripts
-#
-# Revision 1.2  1999/09/10 02:03:31  gareth
-# Added GLU 1.3 tessellation (except winding rule code).
-#
-# Revision 1.1.1.1  1999/08/19 00:55:42  jtg
-# Imported sources
-#
-# Revision 1.2  1999/02/02 04:44:40  brianp
-# fixed some problems
-#
-# Revision 1.1  1999/01/19 04:10:02  brianp
-# Initial revision
-#
-
-
 
 ##### MACROS #####
 
 GLU_MAJOR = 1
-GLU_MINOR = 2
+GLU_MINOR = 1
 GLU_TINY = $(MESA_MAJOR)$(MESA_MINOR)$(MESA_TINY)
 
 VPATH = RCS
@@ -61,8 +32,7 @@ INCDIR = ../include
 LIBDIR = ../lib
 
 SOURCES = glu.c mipmap.c nurbs.c nurbscrv.c nurbssrf.c nurbsutl.c \
-	project.c quadric.c tess.c tess_fist.c tess_hash.c tess_heap.c \
-	tess_winding.c tess_clip.c
+	polytest.c project.c quadric.c tess.c tesselat.c
 
 OBJECTS = $(SOURCES:.c=.o)
 
diff --git a/src/glu/mesa/Makefile.X11 b/src/glu/mesa/Makefile.X11
index 475173864e..1dfe542c74 100644
--- a/src/glu/mesa/Makefile.X11
+++ b/src/glu/mesa/Makefile.X11
@@ -1,8 +1,8 @@
-# $Id: Makefile.X11,v 1.6.2.2 2000/07/11 01:39:41 brianp Exp $
+# $Id: Makefile.X11,v 1.6.2.3 2000/07/11 03:48:23 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.1
-# Copyright (C) 1995-1999  Brian Paul
+# Version:  3.2.1
+# Copyright (C) 1995-2000  Brian Paul
 
 # Makefile for GLU library
 
@@ -10,7 +10,7 @@
 ##### MACROS #####
 
 GLU_MAJOR = 1
-GLU_MINOR = 2
+GLU_MINOR = 1
 GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 VPATH = RCS
diff --git a/src/glu/mesa/Makefile.m32 b/src/glu/mesa/Makefile.m32
index ccceb174b7..9d1bbe4cf1 100644
--- a/src/glu/mesa/Makefile.m32
+++ b/src/glu/mesa/Makefile.m32
@@ -2,8 +2,8 @@
 # Paul Garceau <pgarceau@teleport.com>

 

 # Mesa 3-D graphics library

-# Version:  3.2

-# Copyright (C) 1995-1999  Brian Paul

+# Version:  3.2.1

+# Copyright (C) 1995-2000  Brian Paul

 #

 # This library is free software; you can redistribute it and/or

 # modify it under the terms of the GNU Library General Public

@@ -22,7 +22,7 @@
 

 MESA_MAJOR=3

 MESA_MINOR=2

-MESA_TINY=0

+MESA_TINY=1

 VERSION=$(MESA_MAJOR).$(MESA_MINOR)

 

 CFLAGS = -I. -DWIN32 -D__WIN32__ -D_WINDOWS \

@@ -43,8 +43,7 @@ INCDIR = ../include
 LIBDIR = ../lib

 

 SOURCES = glu.c mipmap.c nurbs.c nurbscrv.c nurbssrf.c nurbsutl.c \

-	project.c quadric.c tess.c tess_fist.c tess_hash.c tess_heap.c \

-	tess_winding.c tess_clip.c

+	polytest.c project.c quadric.c tess.c tesselat.c

 

 OBJECTS = $(SOURCES:.c=.o)

 

@@ -61,4 +60,4 @@ OBJECTS = $(SOURCES:.c=.o)
 

 # Make the library:

 $(LIBDIR)/$(GLU_LIB): $(OBJECTS)

-	$(MAKELIB) $(GLU_LIB) $(MAJOR) $(MINOR) $(TINY) $(OBJECTS)
\ No newline at end of file
+	$(MAKELIB) $(GLU_LIB) $(MAJOR) $(MINOR) $(TINY) $(OBJECTS)