added linux-icc config (Marc.Dietrich)

diff --git a/Make-config b/Make-config
index 9c0b51347feedb06a4a84c8259248293cdd3ccf8..e8d69d7cc1fbc33d0d27d2df789bb24ba3be2f78 100644 (file)
--- a/Make-config
+++ b/Make-config
@@ -1,4 +1,4 @@
-# $Id: Make-config,v 1.59 2002/04/09 14:47:57 keithw Exp $
+# $Id: Make-config,v 1.60 2002/05/05 16:00:06 brianp Exp $
 
 MESA_MAJOR=4
 MESA_MINOR=1
@@ -7,7 +7,7 @@ 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"),
@@ -606,6 +606,32 @@ linux-x86:
                X86/sse_xform3.S X86/sse_xform4.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 -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/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 \
        "GL_LIB = libGL.a" \

diff --git a/Makefile.X11 b/Makefile.X11
index 15fc57ca9fdcb763366d2b898e098d7e89297fca..22963d2245d385bcc9795e01fcde3bc5ef526edd 100644 (file)
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.61 2002/03/11 14:59:50 brianp Exp $
+# $Id: Makefile.X11,v 1.62 2002/05/05 16:00:06 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  4.1
@@ -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-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 \
@@ -400,6 +401,7 @@ LIB_FILES = \
        $(DIRECTORY)/include/GL/xmesa_x.h                               \
        $(DIRECTORY)/include/GL/xmesa_xf86.h                            \
        $(DIRECTORY)/include/GLView.h                                   \
+       $(DIRECTORY)/include/dmesadxe.h                                 \
        $(DIRECTORY)/include/Makefile.in                                \
        $(DIRECTORY)/include/Makefile.am                                \
        $(DIRECTORY)/src/Makefile*                                      \