added linux-osmesa32 config

diff --git a/Make-config b/Make-config
index 7cfb915d0b3b83e2e72590744c9de713a40983ab..6882830fdee89a32eedb0127b1729b8ecb746d83 100644 (file)
--- a/Make-config
+++ b/Make-config
@@ -1,4 +1,4 @@
-# $Id: Make-config,v 1.46 2001/06/18 22:45:16 brianp Exp $
+# $Id: Make-config,v 1.47 2001/07/13 20:08:42 brianp Exp $
 
 MESA_MAJOR=3
 MESA_MINOR=5
@@ -836,7 +836,19 @@ linux-osmesa16:
        "CCFLAGS = $(CFLAGS)" \
        "MAKELIB = ../bin/mklib.linux" \
        "GL_LIB_DEPS = -lm -lpthread" \
-       "APP_LIB_DEPS = -lOSMesa -lGL"
+       "APP_LIB_DEPS = -lOSMesa16 -lGL"
+
+# 32-bit/channel Mesa using OSMesa driver
+linux-osmesa32:
+       $(MAKE) $(MFLAGS) -f Makefile.OSMesa16 targets \
+       "OSMESA16_LIB = libOSMesa32.so" \
+       "CC = gcc" \
+       "CPLUSPLUS = g++" \
+       "CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DCHAN_BITS=32" \
+       "CCFLAGS = $(CFLAGS)" \
+       "MAKELIB = ../bin/mklib.linux" \
+       "GL_LIB_DEPS = -lm -lpthread" \
+       "APP_LIB_DEPS = -lOSMesa32 -lGL"
 
 # May want to add these CFLAGS for better performance under LynxOS and GCC:
 # -fPIC -O2 -ansi -pedantic -mieee-fp -DUSE_XSHM -funroll-loops

diff --git a/Makefile.X11 b/Makefile.X11
index ce50431beabe35fdab859e2d24317065a837b770..5255380be10286873d15f579b979ffd048f42db6 100644 (file)
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.48 2001/06/19 21:49:06 brianp Exp $
+# $Id: Makefile.X11,v 1.49 2001/07/13 20:08:42 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  3.5
@@ -85,6 +85,7 @@ default:
        @echo "  make linux-sparc5-elf     for Sparc5 systems, make ELF shared libs"
        @echo "  make linux-sparc-ultra    for UltraSparc systems, make ELF shared libs"
        @echo "  make linux-osmesa16       for 16-bit/channel OSMesa"
+       @echo "  make linux-osmesa32       for 32-bit/channel OSMesa"
        @echo "  make lynxos               for LynxOS systems with GCC"
        @echo "  make macintosh            for Macintosh"
        @echo "  make machten-2.2          for Macs w/ MachTen 2.2 (68k w/ FPU)"
@@ -294,7 +295,7 @@ linux-ggi-install linux-386-ggi-install:
 #      echo ".include $(DESTDIR)/etc/ggi/ggimesa.conf" >> $(DESTDIR)/etc/ggi/libggi.conf ; \
 #      fi
 
-linux-osmesa16:
+linux-osmesa16 linux-osmesa32:
        -mkdir lib
        if [ -d src ] ; then touch src/depend ; fi
        if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.OSMesa16 $@ ; fi