summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-09-03 14:34:55 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-09-03 14:34:55 +0000
commit67c1fd2fdb3e26e158b00bab590ff38309321b4d (patch)
treea0b5e028c58898d191c018901ff9889f3d9a6090
parentc8363a31cfcd8e3c60387df31525158847ab1457 (diff)
add -lCrun for sunos5, added sunos5-smp (Greg M)
-rw-r--r--Make-config21
-rw-r--r--Makefile.X115
2 files changed, 23 insertions, 3 deletions
diff --git a/Make-config b/Make-config
index 081afb934b..90a3f9ff80 100644
--- a/Make-config
+++ b/Make-config
@@ -929,12 +929,31 @@ sunos5:
"CC = cc" \
"CXX = c++" \
"CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM" \
+ "CXXFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include" \
"GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm" \
"GLUT_CFLAGS = -DSOLARIS_2_4_BUG" \
"GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
"GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm" \
"GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \
- "APP_LIB_DEPS = -lX11 -lglut -lGLU -lGL -lm"
+ "APP_LIB_DEPS = -lCrun -lX11 -lglut -lGLU -lGL -lm"
+
+sunos5-smp:
+ $(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 = cc" \
+ "CPLUSPLUS = CC" \
+ "CFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xparallel -xdepend -xsafe=mem -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM" \
+ "CXXFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xparallel -xdepend -xsafe=mem -I/usr/openwin/include -I/usr/dt/include" \
+ "GLUT_CFLAGS = -DSOLARIS_2_4_BUG" \
+ "MAKELIB = ../bin/mklib.sunos5" \
+ "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \
+ "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -lm" \
+ "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/openwin/lib -lXt -lX11" \
+ "APP_LIB_DEPS = -xparallel -L/usr/openwin/lib -L/usr/dt/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm -lCrun"
sunos5-gcc:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \
diff --git a/Makefile.X11 b/Makefile.X11
index 36030d4be1..750a583cee 100644
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.81 2003/08/24 04:44:23 jonsmirl Exp $
+# $Id: Makefile.X11,v 1.82 2003/09/03 14:34:55 brianp Exp $
# Mesa 3-D graphics library
# Version: 5.1
@@ -89,6 +89,7 @@ default:
@echo " make sunos4-gcc for Suns with SunOS 4.x and GCC"
@echo " make sunos4-gcc-sl for Suns with SunOS 4.x, GCC, make shared libs"
@echo " make sunos5 for Suns with SunOS 5.x"
+ @echo " make sunos5-smp for Suns with SunOS 5.x, SMP optimization"
@echo " make sunos5-gcc for Suns with SunOS 5.x and GCC"
@echo " make ultrix-gcc for DEC systems with Ultrix and GCC"
@echo " make unixware for PCs running UnixWare"
@@ -113,7 +114,7 @@ linux-sparc linux-sparc5 linux-sparc-ultra \
mklinux netbsd osf1 openbsd qnx \
solaris-x86 solaris-x86-gcc \
sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
-sunos5 sunos5-gcc \
+sunos5 sunos5-smp sunos5-gcc \
ultrix-gcc unixware:
-mkdir lib
if [ -d src/mesa ] ; then touch src/mesa/depend ; fi