X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Make-config;h=7948dfa606bf6fd2bf8488a6ddd048fd2e786ef9;hb=d6113fc20d68f5720740b89c594227d0312bab3e;hp=0488e93a29b5cd082554104dec94a3f839ce2333;hpb=94dd6b89277afc1a1305f940a89ed5ead4effc9e;p=mesa.git diff --git a/Make-config b/Make-config index 0488e93a29b..7948dfa606b 100644 --- a/Make-config +++ b/Make-config @@ -1,13 +1,13 @@ -# $Id: Make-config,v 1.52 2001/11/18 23:03:53 brianp Exp $ +# $Id: Make-config,v 1.68 2002/11/14 16:14:52 brianp Exp $ -MESA_MAJOR=4 +MESA_MAJOR=5 MESA_MINOR=1 MESA_TINY=0 VERSION=$(MESA_MAJOR).$(MESA_MINOR) # Mesa 3-D graphics library # -# Copyright (C) 1999-2001 Brian Paul All Rights Reserved. +# Copyright (C) 1999-2002 Brian Paul All Rights Reserved. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -155,7 +155,7 @@ cygnus: "CFLAGS = -I. -DWIN32 -D__WIN32__ -D_WINDOWS \ -O2 -funroll-loops \ -fexpensive-optimizations -fomit-frame-pointer -ffast-math \ - -malign-loops=2 -malign-jumps=2 -malign-functions=2" \ + -malign-loops=2 -malign-functions=2" \ "CCFLAGS = $(CFLAGS)" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "WLIBS = ../lib/wing32.a -lkernel32 -luser32 -lgdi32" @@ -174,10 +174,29 @@ cygnus-linux: "CFLAGS = -I. -DWIN32 -D__WIN32__ -D_WINDOWS \ -O2 -funroll-loops \ -fexpensive-optimizations -fomit-frame-pointer -ffast-math \ - -malign-loops=2 -malign-jumps=2 -malign-functions=2" \ + -malign-loops=2 -malign-functions=2" \ "MAKELIB = ../bin/mklib.cygnus-linux" \ "WLIBS = ../lib/wing32.a -lkernel32 -luser32 -lgdi32" +darwin: + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ + "GL_LIB = libGL.dylib" \ + "GLU_LIB = libGLU.dylib" \ + "GLUT_LIB = libglut.dylib" \ + "GLW_LIB = libGLw.dylib" \ + "OSMESA_LIB = libOSMesa.dylib" \ + "CC = cc" \ + "CPLUSPLUS = cc" \ + "CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math \ + -funroll-loops -fexpensive-optimizations -no-cpp-precomp \ + -dynamic -Ddarwin" \ + "CCFLAGS = $(CFLAGS)" \ + "MAKELIB = ../bin/mklib.darwin" \ + "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ + "GLU_LIB_DEPS = -L../lib -lGL -lm" \ + "GLUT_LIB_DEPS = -L../lib -lGLU -lGL \ + -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" + dgux: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ @@ -289,6 +308,7 @@ hpux9-gcc-sl: "MAKELIB = ../bin/mklib.hpux" \ "APP_LIB_DEPS = -L/usr/lib/X11R5 -lXext -lXmu -lXi -lX11 -lm" +# The hpux10 configs should work for hpux11 as well. hpux10: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ @@ -297,19 +317,23 @@ hpux10: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = cc" \ + "CPLUSPLUS = aCC" \ "CFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ + "CCFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.ar-ruv" \ - "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" + "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -L/usr/lib -lCsup" hpux10-sl: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL" \ "GLU_LIB = libGLU" \ "GLUT_LIB = libglut" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ + "GLW_LIB = libGLw" \ + "OSMESA_LIB = libOSMesa" \ "CC = cc" \ - "CFLAGS = +z -Ae +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ + "CPLUSPLUS = aCC" \ + "CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ + "CCFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ "MAKELIB = ../bin/mklib.hpux" \ "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm" @@ -344,7 +368,7 @@ hpux10-gcc-sl: # For IRIX 4: don't use -fullwarn because it causes too much garbage irix4: - pmake $(MFLAGS) -f Makefile.X11 targets \ + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ "GLU_LIB = libGLU.a" \ "GLUT_LIB = libglut.a" \ @@ -357,7 +381,7 @@ irix4: # On IRIX 5.3 -sopt causes a problem in drawpixels.c so we don't use it irix5: - pmake $(MFLAGS) -f Makefile.X11 targets \ + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ "GLU_LIB = libGLU.a" \ "GLUT_LIB = libglut.a" \ @@ -385,7 +409,7 @@ irix5-gcc: # IRIX 5 using Dynamic Shared Objects (DSO) irix5-dso: - pmake $(MFLAGS) -f Makefile.X11 targets \ + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ "GLU_LIB = libGLU.so" \ "GLUT_LIB = libglut.so" \ @@ -396,34 +420,46 @@ irix5-dso: "MAKELIB = ../bin/mklib.irix5" \ "APP_LIB_DEPS = -rpath ../lib -lX11 -lXmu -lXi -lm" +# IRIX 6 32-bit Targets +# Turn Warnings off for these errors (MIPSpro Compiler 7.30) +# 1521: A nonstandard preprocessing directive is used. +# 1552: The variable "" is set but never used. +# C++ +# 3262: The variable "" was declared but never referenced. +# 3666: The variable "" is set but never used. +# Use -v if using pmake to compile files in subdirectories. irix6-o32: - pmake $(MFLAGS) -f Makefile.X11 targets \ + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ "GLU_LIB = libGLU.a" \ "GLUT_LIB = libglut.a" \ "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ + "LIBDIR = ../lib32" \ "CC = cc" \ - "CFLAGS = -32 -mips2 -O2 -ansi -DUSE_XSHM -DNO_CONST" \ + "CPLUSPLUS = CC" \ + "CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM" \ + "CCFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666" \ "MAKELIB = ../bin/mklib.ar-rcv" \ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" irix6-o32-dso: - pmake $(MFLAGS) -f Makefile.X11 targets \ + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ "GLU_LIB = libGLU.so" \ "GLUT_LIB = libglut.so" \ "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ + "LIBDIR = ../lib32" \ "CC = cc" \ - "CFLAGS = -32 -mips2 -O2 -ansi -DUSE_XSHM -DNO_CONST" \ + "CPLUSPLUS = CC" \ + "CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM" \ + "CCFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666" \ "MAKELIB = ../bin/mklib.irix6-32" \ - "APP_LIB_DEPS = -rpath ../lib -lX11 -lXext -lXmu -lXi -lm" + "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXext -lXmu -lXi -lm" -# For IRIX 6: -woff: -# 1209 - controlling expression is constant irix6-n32: - pmake $(MFLAGS) -f Makefile.X11 targets \ + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ "GLU_LIB = libGLU.a" \ "GLUT_LIB = libglut.a" \ @@ -431,20 +467,24 @@ irix6-n32: "OSMESA_LIB = libOSMesa.a" \ "LIBDIR = ../lib32" \ "CC = cc" \ - "CFLAGS = -n32 -mips3 -O3 -ansi -woff 1209,1521" \ + "CPLUSPLUS = CC" \ + "CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM" \ + "CCFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552" \ "MAKELIB = ../bin/mklib.ar-rcv" \ "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" irix6-n32-dso: - pmake $(MFLAGS) -f Makefile.X11 targets \ + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ "GLU_LIB = libGLU.so" \ "GLUT_LIB = libglut.so" \ - "GLW_LIB = libGLw.a" \ - "OSMESA_LIB = libOSMesa.a" \ + "GLW_LIB = libGLw.so" \ + "OSMESA_LIB = libOSMesa.so" \ "LIBDIR = ../lib32" \ "CC = cc" \ - "CFLAGS = -n32 -mips3 -O3 -ansi -DUSE_XSHM -woff 1185,1521" \ + "CPLUSPLUS = CC" \ + "CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM" \ + "CCFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552" \ "MAKELIB = ../bin/mklib.irix6-n32" \ "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXmu -lXi -lfpe -lm" @@ -472,7 +512,7 @@ irix6-gcc-n32-sl: # 1474 - declaring a void parameter list with a typedef is nonstandard # 1552 - variable was set but never used irix6-64: - pmake $(MFLAGS) -f Makefile.X11 targets \ + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ "GLU_LIB = libGLU.a" \ "GLUT_LIB = libglut.a" \ @@ -485,7 +525,7 @@ irix6-64: "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm" irix6-64-dso: - pmake $(MFLAGS) -f Makefile.X11 targets \ + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.so" \ "GLU_LIB = libGLU.so" \ "GLUT_LIB = libglut.so" \ @@ -562,14 +602,40 @@ linux-x86: "APP_LIB_DEPS = -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S X86/x86_vertex.S \ + X86/x86_cliptest.S \ X86/mmx_blend.S \ X86/3dnow_xform1.S X86/3dnow_xform2.S \ X86/3dnow_xform3.S X86/3dnow_xform4.S \ - X86/3dnow_normal.S X86/3dnow_vertex.S \ + X86/3dnow_normal.S \ X86/sse_xform1.S X86/sse_xform2.S \ X86/sse_xform3.S X86/sse_xform4.S \ - X86/sse_normal.S X86/sse_vertex.S" + X86/sse_normal.S" + +linux-icc: + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ + "GL_LIB = libGL.so" \ + "GLU_LIB = libGLU.so" \ + "GLUT_LIB = libglut.so" \ + "GLW_LIB = libGLw.so" \ + "OSMESA_LIB = libOSMesa.so" \ + "CC = icc" \ + "CPLUSPLUS = g++" \ + "CFLAGS = -O3 -tpp6 -axK -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -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" \ + "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ + "APP_LIB_DEPS = -lm" \ + "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ + X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ + X86/x86_cliptest.S \ + X86/mmx_blend.S \ + X86/3dnow_xform1.S X86/3dnow_xform2.S \ + X86/3dnow_xform3.S X86/3dnow_xform4.S \ + X86/3dnow_normal.S \ + X86/sse_xform1.S X86/sse_xform2.S \ + X86/sse_xform3.S X86/sse_xform4.S \ + X86/sse_normal.S" linux-x86-static: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -580,7 +646,7 @@ linux-x86-static: "OSMESA_LIB = libOSMesa.a" \ "CC = gcc" \ "CPLUSPLUS = g++" \ - "CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -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 -ffast-math -funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-functions=2 -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.ar-ruv" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \ "GLU_LIB_DEPS = -L../lib -lGL -lm" \ @@ -588,14 +654,14 @@ linux-x86-static: "APP_LIB_DEPS = -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S X86/x86_vertex.S \ + X86/x86_cliptest.S \ X86/mmx_blend.S \ X86/3dnow_xform1.S X86/3dnow_xform2.S \ X86/3dnow_xform3.S X86/3dnow_xform4.S \ - X86/3dnow_normal.S X86/3dnow_vertex.S \ + X86/3dnow_normal.S \ X86/sse_xform1.S X86/sse_xform2.S \ X86/sse_xform3.S X86/sse_xform4.S \ - X86/sse_normal.S X86/sse_vertex.S" + X86/sse_normal.S" # Contributed by Uwe_Maurer@t-online.de linux-ggi: @@ -628,7 +694,7 @@ linux-386-ggi: "APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lggi -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S X86/x86_vertex.S" + X86/x86_cliptest.S" linux-glide: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -662,10 +728,10 @@ linux-386-glide: "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \ "GLU_LIB_DEPS = -L../lib -lGL -lm" \ "GLUT_LIB_DEPS = -L../lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ - "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -lglut -lGLU -lGL" + "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -lglut -lGLU -lGL" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S X86/x86_vertex.S" + X86/x86_cliptest.S" linux-386-opt-glide: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -676,7 +742,7 @@ linux-386-opt-glide: "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ "CPLUSPLUS = g++" \ - "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 -DPTHREADS -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-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DFX -DUSE_X86_ASM -DPTHREADS -I/usr/X11R6/include -I/usr/include/glide -I/usr/local/glide/include" \ "CCFLAGS = $(CFLAGS)" \ "MAKELIB = ../bin/mklib.linux" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \ @@ -685,7 +751,7 @@ linux-386-opt-glide: "APP_LIB_DEPS = -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S X86/x86_vertex.S" + X86/x86_cliptest.S" linux-x86-glide: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -696,7 +762,7 @@ linux-x86-glide: "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ "CPLUSPLUS = g++" \ - "CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DUSE_XSHM -DFX -DPTHREADS -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 -malign-loops=2 -malign-functions=2 -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DUSE_XSHM -DFX -DPTHREADS -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" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -L/usr/local/glide/lib -lglide2x -lm -lpthread" \ "GLU_LIB_DEPS = -L../lib -lGL -lm" \ @@ -704,15 +770,15 @@ linux-x86-glide: "APP_LIB_DEPS = -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S X86/x86_vertex.S \ + X86/x86_cliptest.S \ X86/mmx_blend.S \ X86/3dnow_xform1.S X86/3dnow_xform2.S \ X86/3dnow_xform3.S X86/3dnow_xform4.S \ - X86/3dnow_normal.S X86/3dnow_vertex.S \ + X86/3dnow_normal.S \ FX/X86/fx_3dnow_fastpath.S \ X86/sse_xform1.S X86/sse_xform2.S \ X86/sse_xform3.S X86/sse_xform4.S \ - X86/sse_normal.S X86/sse_vertex.S" + X86/sse_normal.S " linux-alpha: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -832,7 +898,7 @@ linux-osmesa16: "OSMESA16_LIB = libOSMesa16.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=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \ + "CFLAGS = -O3 -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=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \ "CCFLAGS = $(CFLAGS)" \ "MAKELIB = ../bin/mklib.linux" \ "GL_LIB_DEPS = -lm -lpthread" \ @@ -844,7 +910,7 @@ linux-osmesa32: "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 -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \ + "CFLAGS = -O3 -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 -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \ "CCFLAGS = $(CFLAGS)" \ "MAKELIB = ../bin/mklib.linux" \ "GL_LIB_DEPS = -lm -lpthread" \ @@ -853,7 +919,7 @@ linux-osmesa32: # May want to add these CFLAGS for better performance under LynxOS and GCC: # -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 +# and -malign-loops=2 -malign-functions=2 for Pentium lynxos: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ @@ -982,7 +1048,7 @@ os2-x11: "APP_LIB_DEPS = -Zmt -Zcrtdll -Zexe -L$(X11ROOT)/XFree86/lib -lXt -lX11 -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S X86/x86_vertex.S" + X86/x86_cliptest.S" osf1: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -1177,6 +1243,7 @@ sunos5: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = cc" \ + "CPLUSPLUS = CC" \ "CFLAGS = -Xa -fast -xO4 -native -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ "MAKELIB = ../bin/mklib.ar-ruv" \ "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -1189,6 +1256,7 @@ sunos5-sl: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = cc" \ + "CPLUSPLUS = CC" \ "CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG" \ "MAKELIB = ../bin/mklib.sunos5" \ "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -1201,6 +1269,7 @@ sunos5-ultra: "GLW_LIB = libGLw.a" \ "OSMESA_LIB = libOSMesa.a" \ "CC = cc" \ + "CPLUSPLUS = CC" \ "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" \ "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -1213,6 +1282,7 @@ sunos5-ultra-sl: "GLW_LIB = libGLw.so" \ "OSMESA_LIB = libOSMesa.so" \ "CC = cc" \ + "CPLUSPLUS = CC" \ "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" \ "APP_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm" @@ -1418,7 +1488,7 @@ vistra: # -woff 1521 = "nonstandard preprocessing directive is used" # -woff 3496 = "bitwise operator precedence" irix-debug: - pmake $(MFLAGS) -f Makefile.X11 targets \ + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ "GLU_LIB = libGLU.a" \ "GLUT_LIB = libglut.a" \ @@ -1431,7 +1501,7 @@ irix-debug: "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXext -lXmu -lXi -lfpe -lXext -lXmu -lXi -lm" DEBUG: - pmake $(MFLAGS) -f Makefile.X11 targets \ + $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ "GLU_LIB = libGLU.a" \ "GLUT_LIB = libglut.a" \ @@ -1452,7 +1522,7 @@ linux-debug: "OSMESA_LIB = libOSMesa.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 -DMESA_TRACE" \ + "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" \ "CCFLAGS = $(CFLAGS)" \ "MAKELIB = ../bin/mklib.linux" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \ @@ -1483,7 +1553,7 @@ linux-x86-debug: "OSMESA_LIB = libOSMesa.so" \ "CC = gcc" \ "CPLUSPLUS = g++" \ - "CFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -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 -DDEBUG -DMESA_DEBUG" \ + "CFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -malign-loops=2 -malign-functions=2 -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 -DDEBUG -DMESA_DEBUG" \ "MAKELIB = ../bin/mklib.linux" \ "GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \ "GLU_LIB_DEPS = -L../lib -lGL -lm" \ @@ -1491,14 +1561,14 @@ linux-x86-debug: "APP_LIB_DEPS = -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S X86/x86_vertex.S \ + X86/x86_cliptest.S \ X86/mmx_blend.S \ X86/3dnow_xform1.S X86/3dnow_xform2.S \ X86/3dnow_xform3.S X86/3dnow_xform4.S \ - X86/3dnow_normal.S X86/3dnow_vertex.S \ + X86/3dnow_normal.S \ X86/sse_xform1.S X86/sse_xform2.S \ X86/sse_xform3.S X86/sse_xform4.S \ - X86/sse_normal.S X86/sse_vertex.S" + X86/sse_normal.S" linux-glide-debug: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -1530,15 +1600,15 @@ linux-prof: "APP_LIB_DEPS = -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S X86/x86_vertex.S \ + X86/x86_cliptest.S \ X86/mmx_blend.S \ X86/3dnow_xform1.S X86/3dnow_xform2.S \ X86/3dnow_xform3.S X86/3dnow_xform4.S \ - X86/3dnow_normal.S X86/3dnow_vertex.S \ + X86/3dnow_normal.S \ FX/X86/fx_3dnow_fastpath.S \ X86/sse_xform1.S X86/sse_xform2.S \ X86/sse_xform3.S X86/sse_xform4.S \ - X86/sse_normal.S X86/sse_vertex.S" + X86/sse_normal.S " linux-glide-prof: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ @@ -1555,12 +1625,12 @@ linux-glide-prof: "APP_LIB_DEPS = -L/usr/local/glide/lib -lglide2x -L/usr/X11/lib -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -lm" \ "ASM_SOURCES = X86/common_x86_asm.S X86/glapi_x86.S \ X86/x86_xform2.S X86/x86_xform3.S X86/x86_xform4.S \ - X86/x86_cliptest.S X86/x86_vertex.S \ + X86/x86_cliptest.S \ X86/mmx_blend.S \ X86/3dnow_xform1.S X86/3dnow_xform2.S \ X86/3dnow_xform3.S X86/3dnow_xform4.S \ - X86/3dnow_normal.S X86/3dnow_vertex.S \ + X86/3dnow_normal.S \ FX/X86/fx_3dnow_fastpath.S \ X86/sse_xform1.S X86/sse_xform2.S \ X86/sse_xform3.S X86/sse_xform4.S \ - X86/sse_normal.S X86/sse_vertex.S" + X86/sse_normal.S"