Squashed commit of the following:

[mesa.git] / configs / linux-icc-static

diff --git a/configs/linux-icc-static b/configs/linux-icc-static
index 5c65f0561851b88a0da60955da9346707da35a0f..d0311962a9c01a7ccbbca7f303651e24436ef83c 100644 (file)
--- a/configs/linux-icc-static
+++ b/configs/linux-icc-static
@@ -6,24 +6,19 @@ CONFIG_NAME = linux-icc-static
 
 # Compiler and flags
 CC = icc
-CXX = g++
+CXX = icpc
 CFLAGS = -O3 -tpp6 -axK -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
-CXXFLAGS = -O3
-GLUT_CFLAGS = -fexceptions
+CXXFLAGS = -O3 -tpp6 -axK -DPTHREADS
 MKLIB_OPTIONS = -static -arch icc
 
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-MKLIB_OPTIONS = -arch icc
-
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
-
+GL_LIB_DEPS =
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -lpthread -lcxa -lunwind
 
+MESA_ASM_SOURCES = $(X86_SOURCES)
+GLAPI_ASM_SOURCES = $(X86_API)