summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>1999-10-15 22:00:07 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>1999-10-15 22:00:07 +0000
commitc6dddaa692ddf1cce7b90b8a2f8aab12614de196 (patch)
tree0e8ca1ed1320f825634d8a7cd08c8e2680baf3d5
parent251ba69ffc6f153f75bba075c9f23c53b2317e9c (diff)
added sco5 config
-rw-r--r--Make-config17
-rw-r--r--Makefile.X115
2 files changed, 17 insertions, 5 deletions
diff --git a/Make-config b/Make-config
index 73877d2eb3..bb2f332cfe 100644
--- a/Make-config
+++ b/Make-config
@@ -1,4 +1,4 @@
-# $Id: Make-config,v 1.5 1999/09/15 17:02:06 brianp Exp $
+# $Id: Make-config,v 1.6 1999/10/15 22:00:07 brianp Exp $
MESA_MAJOR=3
MESA_MINOR=1
@@ -915,8 +915,19 @@ sco:
"MAKELIB = ../bin/mklib.ar-ruv" \
"XLIBS = -L/usr/X11/lib -lX11"
+sco5:
+ $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
+ "GL_LIB = libGL.a" \
+ "GLU_LIB = libGLU.a" \
+ "GLUT_LIB = libglut.a" \
+ "GLW_LIB = libGLw.a" \
+ "CC = gcc" \
+ "CFLAGS = -pedantic -O2 -mieee-fp" \
+ "MAKELIB = ../mklib.ar-ruv" \
+ "XLIBS = -lXm -lXt -lX11 -lXmu -lXext -lsocket -lx"
+
solaris-x86:
- $(MAKE) targets \
+ $(MAKE) -f Makefile.X11 targets \
"GL_LIB = libGL.a" \
"GLU_LIB = libGLU.a" \
"GLUT_LIB = libglut.a" \
@@ -927,7 +938,7 @@ solaris-x86:
"XLIBS = -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi"
solaris-x86-gcc:
- $(MAKE) targets \
+ $(MAKE) -f Makefile.X11 targets \
"GL_LIB = libGL.a" \
"GLU_LIB = libGLU.a" \
"GLUT_LIB = libglut.a" \
diff --git a/Makefile.X11 b/Makefile.X11
index 5bbae4ca6f..11263abd70 100644
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.9 1999/09/20 21:06:57 keithw Exp $
+# $Id: Makefile.X11,v 1.10 1999/10/15 22:00:07 brianp Exp $
# Mesa 3-D graphics library
# Version: 3.1
@@ -104,6 +104,7 @@ default:
@echo " make pgi-mingw32 for mingW32 with Portland Group, Inc. compiler"
@echo " make qnx for QNX V4 systems with Watcom compiler"
@echo " make sco for SCO Unix systems with ODT"
+ @echo " make sco5 for SCO 5.0.5 OpenServer Unix"
@echo " make solaris-x86 for PCs with Solaris"
@echo " make solaris-x86-gcc for PCs with Solaris using GCC"
@echo " make sunos4 for Suns with SunOS 4.x"
@@ -151,7 +152,7 @@ linux-sparc \
linux-sparc5-elf \
linux-sparc-ultra \
lynxos machten-2.2 machten-4.0 \
-mklinux netbsd osf1 osf1-sl openbsd qnx sco \
+mklinux netbsd osf1 osf1-sl openbsd qnx sco sco5 \
solaris-x86 solaris-x86-gcc sunSolaris-CC \
sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
sunos5 sunos5-sl sunos5-ultra sunos5-ultra-sl sunos5-gcc sunos5-gcc-sl \