diff options
| -rw-r--r-- | Make-config | 28 | ||||
| -rw-r--r-- | Makefile.X11 | 5 |
2 files changed, 30 insertions, 3 deletions
diff --git a/Make-config b/Make-config index b45987a03de..37d76f8e319 100644 --- a/Make-config +++ b/Make-config @@ -1,4 +1,4 @@ -# $Id: Make-config,v 1.50.2.7 2002/04/26 13:57:15 brianp Exp $ +# $Id: Make-config,v 1.50.2.8 2002/05/05 15:57:09 brianp Exp $ MESA_MAJOR=4 MESA_MINOR=0 @@ -606,6 +606,32 @@ linux-x86: X86/sse_xform3.S X86/sse_xform4.S \ X86/sse_normal.S X86/sse_vertex.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 -xK -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/x86_vertex.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/sse_xform1.S X86/sse_xform2.S \ + X86/sse_xform3.S X86/sse_xform4.S \ + X86/sse_normal.S X86/sse_vertex.S" + linux-x86-static: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ "GL_LIB = libGL.a" \ diff --git a/Makefile.X11 b/Makefile.X11 index 7e869e7be4a..ea3be33ac1a 100644 --- a/Makefile.X11 +++ b/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.56.2.8 2002/04/26 13:57:15 brianp Exp $ +# $Id: Makefile.X11,v 1.56.2.9 2002/05/05 15:57:09 brianp Exp $ # Mesa 3-D graphics library # Version: 4.0.3 @@ -87,6 +87,7 @@ default: @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 linux-icc for Linux with the Intel C/C++ compiler" @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)" @@ -143,7 +144,7 @@ hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \ hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \ irix4 irix5 irix5-gcc irix5-dso \ linux linux-static linux-debug linux-x11-debug linux-static-debug linux-prof \ -linux-x86 linux-x86-static linux-x86-debug \ +linux-x86 linux-icc linux-x86-static linux-x86-debug \ linux-glide linux-386-glide linux-386-opt-glide \ linux-x86-glide linux-glide-debug linux-glide-prof \ linux-alpha-static linux-alpha \ |