summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-01-19 16:56:50 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-01-19 16:56:50 +0000
commit75c8a2e7be7c2925393ce7fc693044ed599fe1e5 (patch)
treefbe5934c155cb7e90858d79f6bab21c58735aca6
parented43ecee90ad6fdde1e604f7f820ef7f8cd1251b (diff)
omit CVS directories from tarballs, bump version to 6.1
-rw-r--r--Make-config4
-rw-r--r--Makefile.X1118
2 files changed, 12 insertions, 10 deletions
diff --git a/Make-config b/Make-config
index 2b81aadbb5..835be9d42d 100644
--- a/Make-config
+++ b/Make-config
@@ -9,7 +9,7 @@
MESA_MAJOR=6
-MESA_MINOR=0
+MESA_MINOR=1
MESA_TINY=0
VERSION=$(MESA_MAJOR).$(MESA_MINOR)
@@ -739,7 +739,7 @@ linux-solo:
"GLUT_LIB = libglut.so" \
"CC = gcc" \
"CXX = g++" \
- "CFLAGS = -g -std=c99 -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
+ "CFLAGS = -g -std=c99 -pedantic -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
"CXXFLAGS = -g -Wall -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE" \
"GLUT_CFLAGS = -fexceptions" \
"GL_LIB_DEPS = -lm -lpthread -lexpat" \
diff --git a/Makefile.X11 b/Makefile.X11
index 534b7e22f9..565b4cf732 100644
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.107 2004/01/11 17:15:03 brianp Exp $
+# $Id: Makefile.X11,v 1.108 2004/01/19 16:56:50 brianp Exp $
# Mesa 3-D graphics library
-# Version: 6.0
+# Version: 6.1
#
# Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
#
@@ -473,10 +473,10 @@ cvsclean: realclean
-DIRECTORY = Mesa-6.0
-LIB_NAME = MesaLib-6.0
-DEMO_NAME = MesaDemos-6.0
-GLU_NAME = MesaGLU-6.0
+DIRECTORY = Mesa-6.1
+LIB_NAME = MesaLib-6.1
+DEMO_NAME = MesaDemos-6.1
+GLU_NAME = MesaGLU-6.1
GLUT_NAME = GLUT-3.7
@@ -631,14 +631,16 @@ DEMO_FILES = \
$(DIRECTORY)/src/glut/dos/*.[ch] \
$(DIRECTORY)/src/glut/dos/Makefile.DJ \
$(DIRECTORY)/src/glut/dos/PC_HW/*.[chS] \
- $(DIRECTORY)/progs/images/* \
+ $(DIRECTORY)/progs/images/*.rgb \
+ $(DIRECTORY)/progs/images/*.rgba \
$(DIRECTORY)/progs/demos/Makefile* \
$(DIRECTORY)/progs/demos/descrip.mms \
$(DIRECTORY)/progs/demos/*.[ch] \
$(DIRECTORY)/progs/demos/*.cxx \
$(DIRECTORY)/progs/demos/*.dat \
$(DIRECTORY)/progs/demos/README \
- $(DIRECTORY)/progs/demos/Windows/* \
+ $(DIRECTORY)/progs/demos/Windows/*.dsp \
+ $(DIRECTORY)/progs/demos/Windows/*.dsw \
$(DIRECTORY)/progs/xdemos/Makefile* \
$(DIRECTORY)/progs/xdemos/descrip.mms \
$(DIRECTORY)/progs/xdemos/*.[chf] \