diff options
| -rw-r--r-- | Make-config | 160 | ||||
| -rw-r--r-- | src/mesa/drivers/osmesa/osmesa.c | 8 |
2 files changed, 84 insertions, 84 deletions
diff --git a/Make-config b/Make-config index a036580f3e9..ee9eada0db5 100644 --- a/Make-config +++ b/Make-config @@ -1,7 +1,7 @@ -# $Id: Make-config,v 1.10 1999/11/02 10:11:44 brianp Exp $ +# $Id: Make-config,v 1.11 1999/11/11 01:28:16 brianp Exp $ MESA_MAJOR=3 -MESA_MINOR=1 +MESA_MINOR=3 MESA_TINY=0 VERSION=$(MESA_MAJOR).$(MESA_MINOR) @@ -46,7 +46,7 @@ VERSION=$(MESA_MAJOR).$(MESA_MINOR) # To enable profiling add -DPROFILE to the CFLAGS line. Be sure to set the # MESA_PROFILE environment variable to enable printing of the profile report. # -# If your system supports the X Shared Memory extension add -DSHM to the +# If your system supports the X Shared Memory extension add -DUSE_XSHM to the # CFLAGS line and add -lXext to the XLIBS line. # # Some compilers complain about const parameters. Adding -DNO_CONST to the @@ -183,7 +183,7 @@ freebsd: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100" \ + "CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \ "MAKELIB = ../bin/mklib.freebsd" \ "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" @@ -194,7 +194,7 @@ freebsd-386: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DSHM -DHZ=100 -DUSE_X86_ASM -DFREEBSD" \ + "CFLAGS = -O3 -ffast-math -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100 -DUSE_X86_ASM -DFREEBSD" \ "MAKELIB = ../bin/mklib.freebsd" \ "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S" @@ -217,7 +217,7 @@ hpux9: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = cc" \ - "CFLAGS = +O3 -Aa -D_HPUX_SOURCE -I/usr/include/X11R5 -DSHM" \ + "CFLAGS = +O3 -Aa -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm" @@ -228,7 +228,7 @@ hpux9-gcc: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DSHM" \ + "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm" @@ -239,7 +239,7 @@ hpux9-sl: "GLUT_LIB = libglut.sl" \ "GLW_LIB = libGLw.sl" \ "CC = cc" \ - "CFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DSHM" \ + "CFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.hpux" \ "XLIBS = -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm" @@ -250,7 +250,7 @@ hpux9-gcc-sl: "GLUT_LIB = libglut.sl" \ "GLW_LIB = libGLw.sl" \ "CC = gcc" \ - "CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DSHM" \ + "CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.hpux" \ "XLIBS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm" @@ -261,7 +261,7 @@ hpux10: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = cc" \ - "CFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DSHM" \ + "CFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" @@ -272,7 +272,7 @@ hpux10-sl: "GLUT_LIB = libglut" \ "GLW_LIB = libGLw.a" \ "CC = cc" \ - "CFLAGS = +z -Ae +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DSHM" \ + "CFLAGS = +z -Ae +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.hpux" \ "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" @@ -283,7 +283,7 @@ hpux10-gcc: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DSHM" \ + "CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" @@ -294,7 +294,7 @@ hpux10-gcc-sl: "GLUT_LIB = libglut.sl" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DSHM" \ + "CFLAGS = -fPIC -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.hpux" \ "XLIBS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" @@ -307,7 +307,7 @@ irix4: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = cc" \ - "CFLAGS = -O2 -ansi -prototypes -DSHM" \ + "CFLAGS = -O2 -ansi -prototypes -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.ar-rcv" \ "XLIBS = -lXext -lXmu -lXi -lX11 -lm" @@ -319,7 +319,7 @@ irix5: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = cc" \ - "CFLAGS = -O2 -ansi -fullwarn -DSHM -DNO_CONST" \ + "CFLAGS = -O2 -ansi -fullwarn -DUSE_XSHM -DNO_CONST" \ "MAKELIB = ../bin/mklib.ar-rcv" \ "XLIBS = -lX11 -lXext -lXmu -lXi -lm" @@ -331,7 +331,7 @@ irix5-gcc: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -O2 -pedantic -DSHM" \ + "CFLAGS = -O2 -pedantic -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.ar-rcv" \ "XLIBS = -lX11 -lXext -lXmu -lXi -lm" @@ -343,7 +343,7 @@ irix5-dso: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = cc" \ - "CFLAGS = -O2 -ansi -fullwarn -DSHM -DNO_CONST" \ + "CFLAGS = -O2 -ansi -fullwarn -DUSE_XSHM -DNO_CONST" \ "MAKELIB = ../bin/mklib.irix5" \ "XLIBS = -rpath ../lib -lX11 -lXmu -lXi -lm" @@ -354,7 +354,7 @@ irix6-o32: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = cc" \ - "CFLAGS = -32 -mips2 -O2 -ansi -DSHM -DNO_CONST" \ + "CFLAGS = -32 -mips2 -O2 -ansi -DUSE_XSHM -DNO_CONST" \ "MAKELIB = ../bin/mklib.ar-rcv" \ "XLIBS = -lX11 -lXext -lXmu -lXi -lm" @@ -365,7 +365,7 @@ irix6-o32-dso: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = cc" \ - "CFLAGS = -32 -mips2 -O2 -ansi -DSHM -DNO_CONST" \ + "CFLAGS = -32 -mips2 -O2 -ansi -DUSE_XSHM -DNO_CONST" \ "MAKELIB = ../bin/mklib.irix6-32" \ "XLIBS = -rpath ../lib -lX11 -lXext -lXmu -lXi -lm" @@ -391,7 +391,7 @@ irix6-n32-dso: "GLW_LIB = libGLw.a" \ "LIBDIR = ../lib32" \ "CC = cc" \ - "CFLAGS = -n32 -mips3 -O3 -ansi -DSHM -woff 1185,1521" \ + "CFLAGS = -n32 -mips3 -O3 -ansi -DUSE_XSHM -woff 1185,1521" \ "MAKELIB = ../bin/mklib.irix6-n32" \ "XLIBS = -rpath ../lib32 -lX11 -lXmu -lXi -lfpe -lm" @@ -403,7 +403,7 @@ irix6-gcc-n32-sl: "GLW_LIB = libGLw.so" \ "LIBDIR = ../lib32" \ "CC = gcc" \ - "CFLAGS = -mabi=n32 -mips3 -O3 -DSHM" \ + "CFLAGS = -mabi=n32 -mips3 -O3 -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.irix6-n32" \ "XLIBS = -rpath ../lib32 -lX11 -lXmu -lXi -lm" @@ -423,7 +423,7 @@ irix6-64: "GLW_LIB = libGLw.a" \ "LIBDIR = ../lib64" \ "CC = cc" \ - "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DSHM" \ + "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.ar-rcv" \ "XLIBS = -lX11 -lXext -lXmu -lXi -lm" @@ -435,12 +435,12 @@ irix6-64-dso: "GLW_LIB = libGLw.so" \ "LIBDIR = ../lib64" \ "CC = cc" \ - "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DSHM" \ + "CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.irix6-64" \ "XLIBS = -rpath ../lib64 -lX11 -lXmu -lXi -lm" # May want to try these CFLAGS for better performance under Linux and GCC: -# -fPIC -O2 -ansi -pedantic -mieee-fp -DSHM -funroll-loops +# -fPIC -O2 -ansi -pedantic -mieee-fp -DUSE_XSHM -funroll-loops # -fexpensive-optimizations -fomit-frame-pointer -ffast-math # and -malign-loops=2 -malign-jumps=2 -malign-functions=2 for Pentium @@ -451,7 +451,7 @@ linux: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -I/usr/X11R6/include" \ + "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -I/usr/X11R6/include" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" @@ -465,7 +465,7 @@ linux-elf: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -I/usr/X11R6/include" \ + "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -I/usr/X11R6/include" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" @@ -476,7 +476,7 @@ linux-glide: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \ + "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm" @@ -488,7 +488,7 @@ linux-386: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DUSE_X86_ASM -I/usr/X11R6/include" \ + "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -I/usr/X11R6/include" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/vertex.S" @@ -500,7 +500,7 @@ linux-386-elf: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DUSE_X86_ASM -I/usr/X11R6/include" \ + "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -I/usr/X11R6/include" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/vertex.S" @@ -512,7 +512,7 @@ linux-386-glide: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \ + "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_XSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/vertex.S" @@ -524,7 +524,7 @@ linux-386-glide-mits: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DFX -D_REENTRANT -DMITS -DUSE_X86_ASM -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \ + "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -D_REENTRANT -DMITS -DUSE_X86_ASM -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm -lpthread" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/vertex.S" @@ -536,7 +536,7 @@ linux-386-opt-V2-glide: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DFX -DFX_V2 -DUSE_X86_ASM -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include"\ + "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DFX_V2 -DUSE_X86_ASM -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include"\ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm -lpthread" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/vertex.S" @@ -548,7 +548,7 @@ linux-386-opt-glide: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DFX -DUSE_X86_ASM -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \ + "CFLAGS = -O3 -m486 -fomit-frame-pointer -pipe -ansi -pedantic -ffast-math -fexpensive-optimizations -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DUSE_X86_ASM -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/vertex.S" @@ -560,7 +560,7 @@ linux-3dnow: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \ - "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -I/usr/X11R6/include" \ + "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -I/usr/X11R6/include" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S \ @@ -578,7 +578,7 @@ linux-3dnow-glide: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \ - "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \ + "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_XSHM -DFX -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include -I/usr/src/mesa-glx/src/FX/X86" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/local/glide/lib -lglide2x -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S \ @@ -598,7 +598,7 @@ linux-386-pthread-shared-glide: "GLU_LIB = libGLU.so" \ "GLUT_LIB = libglut.so" \ "CC = gcc" \ - "CFLAGS = -O3 -fPIC -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM -DUSE_X86_ASM -D_REENTRANT -DTHREADS -DPTHREADS -DFX -I/usr/include/glide -I/usr/local/glide/include" \ + "CFLAGS = -O3 -fPIC -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -D_REENTRANT -DTHREADS -DPTHREADS -DFX -I/usr/include/glide -I/usr/local/glide/include" \ "MAKELIB = ../mklib.glide" \ "XLIBS = -L/usr/X11/lib -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lpthread -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S \ @@ -612,7 +612,7 @@ linux-ggi: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM -DGGI -DCDECL=" \ + "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DGGI -DCDECL=" \ "MAKELIB = ../bin/mklib.ggi" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lggi -lm" @@ -624,7 +624,7 @@ linux-386-ggi: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM -DUSE_X86_ASM -DGGI -DCDECL=" \ + "CFLAGS = -O3 -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -DGGI -DCDECL=" \ "MAKELIB = ../bin/mklib.ggi" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lggi -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/vertex.S" @@ -637,7 +637,7 @@ linux-alpha: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -O2 -mieee -pedantic -L/usr/X11R6/lib -D_XOPEN_SOURCE -DSHM" \ + "CFLAGS = -O2 -mieee -pedantic -L/usr/X11R6/lib -D_XOPEN_SOURCE -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lm" @@ -648,7 +648,7 @@ linux-alpha-elf: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DSHM" \ + "CFLAGS = -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi -lm" @@ -664,7 +664,7 @@ linux-ppc: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM" \ + "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" @@ -676,7 +676,7 @@ linux-ppc-so: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM" \ + "CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" @@ -687,7 +687,7 @@ linux-386-pthread: "GLU_LIB = libGLU.a" \ "GLUT_LIB = libglut.a" \ "CC = gcc" \ - "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R\6/include -DSHM -DUSE_X86_ASM -D_REENTRANT -DTHREADS -DPTHREADS" \ + "CFLAGS = -O2 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R\6/include -DUSE_XSHM -DUSE_X86_ASM -D_REENTRANT -DTHREADS -DPTHREADS" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lpthread -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/vertex.S" @@ -699,7 +699,7 @@ linux-386-pthread-shared: "GLU_LIB = libGLU.so" \ "GLUT_LIB = libglut.so" \ "CC = gcc" \ - "CFLAGS = -O3 -fPIC -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/us\r/X11R6/include -DSHM -DUSE_X86_ASM -D_REENTRANT -DTHREADS -DPTHREADS" \ + "CFLAGS = -O3 -fPIC -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/us\r/X11R6/include -DUSE_XSHM -DUSE_X86_ASM -D_REENTRANT -DTHREADS -DPTHREADS" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lpthread -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/vertex.S" @@ -711,7 +711,7 @@ linux-sparc: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -pedantic -funroll-loops -O3 -DSHM" \ + "CFLAGS = -pedantic -funroll-loops -O3 -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXt -lSM -lICE -lXmu -lXi -lm" @@ -723,7 +723,7 @@ linux-sparc5-elf: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -mv8 -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM" \ + "CFLAGS = -mv8 -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" @@ -735,12 +735,12 @@ linux-sparc-ultra: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM" \ + "CFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" # May want to add these CFLAGS for better performance under LynxOS and GCC: -# -fPIC -O2 -ansi -pedantic -mieee-fp -DSHM -funroll-loops +# -fPIC -O2 -ansi -pedantic -mieee-fp -DUSE_XSHM -funroll-loops # -fexpensive-optimizations -fomit-frame-pointer -ffast-math # and -malign-loops=2 -malign-jumps=2 -malign-functions=2 for Pentium @@ -751,7 +751,7 @@ lynxos: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -O2 -ansi -pedantic -funroll-loops -ffast-math -DSHM" \ + "CFLAGS = -O2 -ansi -pedantic -funroll-loops -ffast-math -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/X11/lib -lXext -lXi -lXmu -lX11 -lbsd -lm" @@ -795,7 +795,7 @@ netbsd: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -O2 -fPIC -DSHM -I/usr/X11R6/include -DHZ=100" \ + "CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100" \ "MAKELIB = ../bin/mklib.netbsd" \ "XLIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" @@ -815,7 +815,7 @@ openbsd: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = cc" \ - "CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DSHM -DHZ=100" \ + "CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DUSE_XSHM -DHZ=100" \ "MAKELIB = ../bin/mklib.openbsd" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXi -lm" @@ -856,7 +856,7 @@ osf1: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = cc" \ - "CFLAGS = -O2 -std1 -ieee_with_no_inexact -DSHM -DNO_CONST" \ + "CFLAGS = -O2 -std1 -ieee_with_no_inexact -DUSE_XSHM -DNO_CONST" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -lX11 -lXext -lXmu -lXi -lm" @@ -867,7 +867,7 @@ osf1-sl: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = cc" \ - "CFLAGS = -O2 -std1 -ieee_with_no_inexact -DSHM -DNO_CONST" \ + "CFLAGS = -O2 -std1 -ieee_with_no_inexact -DUSE_XSHM -DNO_CONST" \ "MAKELIB = ../bin/mklib.osf1" \ "XLIBS = -lX11 -lXext -lXmu -lXi -lm" @@ -934,7 +934,7 @@ solaris-x86: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = cc" \ - "CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DSHM" \ + "CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.solaris" \ "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -945,7 +945,7 @@ solaris-x86-gcc: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DSHM" \ + "CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.solaris" \ "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -956,7 +956,7 @@ sunos4: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = acc" \ - "CFLAGS = -O -DSHM -DSUNOS4" \ + "CFLAGS = -O -DUSE_XSHM -DSUNOS4" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -lX11 -lXext -lXmu -lXi -lm" @@ -967,7 +967,7 @@ sunos4-sl: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = acc" \ - "CFLAGS = -Kpic -O -I/usr/include/X11R5 -DSHM -DSUNOS4" \ + "CFLAGS = -Kpic -O -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4" \ "MAKELIB = ld -assert pure-text -o" \ "XLIBS = -L/usr/lib/X11R5 -lX11 -lXext -lXmu -lXi -lm" @@ -978,7 +978,7 @@ sunos4-gcc: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -O3 -DSHM -DSUNOS4 -I/usr/openwin/include" \ + "CFLAGS = -O3 -DUSE_XSHM -DSUNOS4 -I/usr/openwin/include" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -989,7 +989,7 @@ sunos4-gcc-sl: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X11R5 -DSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \ + "CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \ "MAKELIB = ../bin/mklib.sunos4" \ "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -1000,7 +1000,7 @@ sunos4-gcc-x11r6-sl: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -fPIC -O3 -I/usr/X11R6.3/include -DSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \ + "CFLAGS = -fPIC -O3 -I/usr/X11R6.3/include -DUSE_XSHM -DSUNOS4 -DSOLARIS_2_4_BUG" \ "MAKELIB = ../bin/mklib.sunos4" \ "XLIBS = -L/usr/X11R6.3/lib/X11 -lX11 -lXext -lXmu -lXi -lm" @@ -1011,7 +1011,7 @@ sunos5: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = cc" \ - "CFLAGS = -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DSHM -DSOLARIS_2_4_BUG" \ + "CFLAGS = -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -1022,7 +1022,7 @@ sunos5-sl: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = cc" \ - "CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DSHM -DSOLARIS_2_4_BUG" \ + "CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ "MAKELIB = ../bin/mklib.sunos5" \ "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -1033,7 +1033,7 @@ sunos5-ultra: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = cc" \ - "CFLAGS = -Xa -fast -xO5 -xtarget=ultra -I/usr/openwin/include -I/usr/dt/include -DSHM -DSOLARIS_2_4_BUG" \ + "CFLAGS = -Xa -fast -xO5 -xtarget=ultra -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -1044,7 +1044,7 @@ sunos5-ultra-sl: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = cc" \ - "CFLAGS = -KPIC -Xa -fast -xO5 -xtarget=ultra -I/usr/openwin/include -I/usr/dt/include -DSHM -DSOLARIS_2_4_BUG" \ + "CFLAGS = -KPIC -Xa -fast -xO5 -xtarget=ultra -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ "MAKELIB = ../bin/mklib.sunos5" \ "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -1055,7 +1055,7 @@ sunos5-gcc: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -O3 -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG" \ + "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -1066,7 +1066,7 @@ sunos5-gcc-sl: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -fPIC -O3 -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG" \ + "CFLAGS = -fPIC -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ "MAKELIB = ../bin/mklib.sunos5" \ "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -1077,7 +1077,7 @@ sunos5-x11r6-gcc-sl: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -fPIC -O3 -DSHM -DSOLARIS_2_4_BUG" \ + "CFLAGS = -fPIC -O3 -DUSE_XSHM -DSOLARIS_2_4_BUG" \ "MAKELIB = ../bin/mklib.sunos5" \ "XLIBS = -lSM -lICE -lX11 -lXext -lXmu -lXi -lnsl -lsocket -lm" @@ -1088,7 +1088,7 @@ sunos5-pthread: "GLU_LIB = libGLU.a" \ "GLUT_LIB = libglut.a" \ "CC = cc" \ - "CFLAGS = -mt -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DSHM -DSOLARIS_2_4\_BUG -DTHREADS -DPTHREADS" \ + "CFLAGS = -mt -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4\_BUG -DTHREADS -DPTHREADS" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm" @@ -1099,7 +1099,7 @@ sunos5-thread: "GLU_LIB = libGLU.a" \ "GLUT_LIB = libglut.a" \ "CC = cc" \ - "CFLAGS = -mt -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DSHM -DSOLARIS_2_4\_BUG -DTHREADS -DSOLARIS_THREADS" \ + "CFLAGS = -mt -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4\_BUG -DTHREADS -DSOLARIS_THREADS" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lthread -lm" @@ -1110,7 +1110,7 @@ sunos5-gcc-thread: "GLU_LIB = libGLU.a" \ "GLUT_LIB = libglut.a" \ "CC = gcc" \ - "CFLAGS = -O3 -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG -D_REENTRANT -DTHREADS -DSOLARIS_THR\EADS" \ + "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG -D_REENTRANT -DTHREADS -DSOLARIS_THREADS" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lthread -lm" @@ -1121,7 +1121,7 @@ sunos5-gcc-pthread: "GLU_LIB = libGLU.a" \ "GLUT_LIB = libglut.a" \ "CC = gcc" \ - "CFLAGS = -O3 -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG -D_REENTRANT -DTHREADS -DPTHREADS" \ + "CFLAGS = -O3 -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG -D_REENTRANT -DTHREADS -DPTHREADS" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lpthread -lm" @@ -1133,7 +1133,7 @@ sunSolaris-CC: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = CC" \ - "CFLAGS = -O -I/usr/openwin/include -DSHM -DSOLARIS_2_4_BUG" \ + "CFLAGS = -O -I/usr/openwin/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -1179,7 +1179,7 @@ unixware: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = cc" \ - "CFLAGS = -O -I/usr/X/include -DSHM" \ + "CFLAGS = -O -I/usr/X/include -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm" @@ -1190,7 +1190,7 @@ unixware-shared: "GLUT_LIB = libglut" \ "GLW_LIB = libGLw" \ "CC = cc" \ - "CFLAGS = -O -I/usr/X/include -KPIC,inline -DSHM" \ + "CFLAGS = -O -I/usr/X/include -KPIC,inline -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.solaris" \ "XLIBS = -lX11 -lXext -lXmu -lXi -lsocket -lnsl -lm" @@ -1230,7 +1230,7 @@ irix-debug: "GLW_LIB = libGLw.a" \ "LIBDIR = ../lib32" \ "CC = cc" \ - "CFLAGS = -g -n32 -ansi -fullwarn -DSHM -DDEBUG -woff 1209,1210,1506,1521,3496" \ + "CFLAGS = -g -n32 -ansi -fullwarn -DUSE_XSHM -DDEBUG -woff 1209,1210,1506,1521,3496" \ "MAKELIB = ../bin/mklib.ar-rcv" \ "XLIBS = -rpath ../lib32 -lX11 -lXext -lXmu -lXi -lfpe -lXext -lXmu -lXi -lm" @@ -1241,7 +1241,7 @@ DEBUG: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = cc" \ - "CFLAGS = -g -ansi -prototypes -fullwarn -DSHM -DDEBUG" \ + "CFLAGS = -g -ansi -prototypes -fullwarn -DUSE_XSHM -DDEBUG" \ "MAKELIB = ../bin/mklib.ar-rcv" \ "XLIBS = -lX11 -lXext -lXmu -lXi -lfpe -lm" @@ -1253,7 +1253,7 @@ linux-debug: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -g -ansi -pedantic -Wall -DSHM -DDEBUG -DSVGA -DFX -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM_not -I/usr/include/glide -I/usr/local/glide/include" \ + "CFLAGS = -g -ansi -pedantic -Wall -DUSE_XSHM -DDEBUG -DSVGA -DFX -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM_not -I/usr/include/glide -I/usr/local/glide/include" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/local/glide/lib -lglide2x -ltexus -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lvga -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/vertex.S" @@ -1265,7 +1265,7 @@ linux-elf-debug: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -g -ansi -pedantic -Wall -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM -DDEBUG" \ + "CFLAGS = -g -ansi -pedantic -Wall -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DDEBUG" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lvga -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/vertex.S" @@ -1277,7 +1277,7 @@ linux-glide-debug: "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "CC = gcc" \ - "CFLAGS = -g -ansi -pedantic -Wall -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DSHM -DFX -DDEBUG -I/usr/local/glide/include -I/usr/include/glide" \ + "CFLAGS = -g -ansi -pedantic -Wall -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DFX -DDEBUG -I/usr/local/glide/include -I/usr/include/glide" \ "MAKELIB = ../bin/mklib.linux" \ "XLIBS = -L/usr/local/glide/lib -lglide2x -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lvga -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S X86/vertex.S" @@ -1290,7 +1290,7 @@ linux-prof: "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "CC = gcc" \ - "CFLAGS = -O2 -pg -ansi -pedantic -Wall -DSHM -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -I/usr/include/glide -I/usr/local/glide/include" \ + "CFLAGS = -O2 -pg -ansi -pedantic -Wall -DUSE_XSHM -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -I/usr/include/glide -I/usr/local/glide/include" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "XLIBS = -L/usr/local/glide/lib -lglide2x -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \ "ASM_SOURCES = X86/x86a.S X86/common_x86asm.S \ diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index 91da84565ed..a0bb746d007 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -1,8 +1,8 @@ -/* $Id: osmesa.c,v 1.2 1999/10/13 18:43:46 brianp Exp $ */ +/* $Id: osmesa.c,v 1.3 1999/11/11 01:28:41 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.1 + * Version: 3.3 * * Copyright (C) 1999 Brian Paul All Rights Reserved. * @@ -38,7 +38,7 @@ #include "GL/osmesa.h" #include "context.h" #include "depth.h" -#include "macros.h" +#include "mem.h" #include "matrix.h" #include "types.h" #include "vb.h" @@ -400,7 +400,7 @@ GLboolean GLAPIENTRY OSMesaMakeCurrent( OSMesaContext ctx, void *buffer, GLenum /* init viewport */ if (ctx->gl_ctx->Viewport.Width==0) { /* initialize viewport and scissor box to buffer size */ - gl_Viewport( ctx->gl_ctx, 0, 0, width, height ); + _mesa_Viewport( 0, 0, width, height ); ctx->gl_ctx->Scissor.Width = width; ctx->gl_ctx->Scissor.Height = height; } |