undo previous check-in (restore the @ symbols)

[mesa.git] / Make-config

diff --git a/Make-config b/Make-config
index 9f04b818ba0d183b6bf978cec3834e5cc336e42a..6882830fdee89a32eedb0127b1729b8ecb746d83 100644 (file)
--- a/Make-config
+++ b/Make-config
@@ -1,4 +1,4 @@
-# $Id: Make-config,v 1.45 2001/05/15 15:27:43 brianp Exp $
+# $Id: Make-config,v 1.47 2001/07/13 20:08:42 brianp Exp $
 
 MESA_MAJOR=3
 MESA_MINOR=5
@@ -554,7 +554,7 @@ linux-x86:
        "OSMESA_LIB = libOSMesa.so" \
        "CC = gcc" \
        "CPLUSPLUS = g++" \
-       "CFLAGS = -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include" \
+       "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include" \
        "MAKELIB = ../bin/mklib.linux" \
        "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
        "GLU_LIB_DEPS = -L../lib -lGL -lm" \
@@ -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