Squashed commit of the following:

[mesa.git] / configs / hpux11-ia64

diff --git a/configs/hpux11-ia64 b/configs/hpux11-ia64
index 58fa45d9dfc208ff93fe213b21d56b43d7e91461..e27a22101fd55ca47bdf3b678b58bf651b790773 100644 (file)
--- a/configs/hpux11-ia64
+++ b/configs/hpux11-ia64
@@ -8,9 +8,9 @@ CONFIG_NAME = hpux11-ia64
 CC = cc
 CXX = aCC
 
-CFLAGS = +z -Ae +DD64 +O3 +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
+CFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
 
-CXXFLAGS = +z -Aa +DD64 +O3 +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
+CXXFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
 
 MKLIB_OPTIONS =
 
@@ -19,12 +19,10 @@ LIB_DIR = lib64
 # Library names (actual file names)
 GL_LIB_NAME = libGL.so
 GLU_LIB_NAME = libGLU.so
-GLUT_LIB_NAME = libglut.so
 GLW_LIB_NAME = libGLw.so
 OSMESA_LIB_NAME = libOSMesa.so
 
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS)
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)