diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-07-13 20:08:42 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-07-13 20:08:42 +0000 |
| commit | 5b22aa1e339b77fa7e3e8ba134619c7e5ef93900 (patch) | |
| tree | 00fb155974c93c7c4dbbc19ef07003bc798486b3 | |
| parent | f431a3fb4dc1bf860203d79e54657e3a62bc50df (diff) | |
added linux-osmesa32 config
| -rw-r--r-- | Make-config | 16 | ||||
| -rw-r--r-- | Makefile.X11 | 5 |
2 files changed, 17 insertions, 4 deletions
diff --git a/Make-config b/Make-config index 7cfb915d0b..6882830fde 100644 --- 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 ce50431bea..5255380be1 100644 --- 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 |