summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>1999-09-17 00:07:26 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>1999-09-17 00:07:26 +0000
commit738e9775800c0dd363c0ebef5dc439cbe4911155 (patch)
tree8fca744add1e73bcd2793ecf94030c89d00d4f6c
parentf33e6b1e83253147c07404b7e088236dbca04ca6 (diff)
link with -lGLU -lGL instead of -lMesaGLU -lMesaGL
-rw-r--r--progs/demos/Makefile.BeOS-R411
-rw-r--r--progs/redbook/Makefile.BeOS-R411
-rw-r--r--progs/samples/Makefile.BeOS-R44
3 files changed, 16 insertions, 10 deletions
diff --git a/progs/demos/Makefile.BeOS-R4 b/progs/demos/Makefile.BeOS-R4
index c0d990e4a0..b7b48ec84c 100644
--- a/progs/demos/Makefile.BeOS-R4
+++ b/progs/demos/Makefile.BeOS-R4
@@ -1,4 +1,4 @@
-# $Id: Makefile.BeOS-R4,v 1.1 1999/08/19 00:55:40 jtg Exp $
+# $Id: Makefile.BeOS-R4,v 1.2 1999/09/17 00:07:26 brianp Exp $
# Mesa 3-D graphics library
# Version: 3.1
@@ -23,8 +23,11 @@
# $Log: Makefile.BeOS-R4,v $
-# Revision 1.1 1999/08/19 00:55:40 jtg
-# Initial revision
+# Revision 1.2 1999/09/17 00:07:26 brianp
+# link with -lGLU -lGL instead of -lMesaGLU -lMesaGL
+#
+# Revision 1.1.1.1 1999/08/19 00:55:40 jtg
+# Imported sources
#
# Revision 1.5 1999/06/22 12:50:11 brianp
# removed multitex demo
@@ -49,7 +52,7 @@
INCDIR = ../include
LIBDIR = ../lib
-GL_LIBS = -L$(LIBDIR) -L/boot/home/config/lib -Xlinker -rpath $(LIBDIR) -lbe -lglut -lMesaGLU -lMesaGL $(XLIBS)
+GL_LIBS = -L$(LIBDIR) -L/boot/home/config/lib -Xlinker -rpath $(LIBDIR) -lbe -lglut -lGLU -lGL $(XLIBS)
LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
diff --git a/progs/redbook/Makefile.BeOS-R4 b/progs/redbook/Makefile.BeOS-R4
index f99e8edf4c..4f6734e67b 100644
--- a/progs/redbook/Makefile.BeOS-R4
+++ b/progs/redbook/Makefile.BeOS-R4
@@ -1,12 +1,15 @@
-# $Id: Makefile.BeOS-R4,v 1.1 1999/08/19 00:55:40 jtg Exp $
+# $Id: Makefile.BeOS-R4,v 1.2 1999/09/17 00:08:31 brianp Exp $
# Makefile for OpenGL Programming Guide programs for BeOS R4
# This file is in the public domain.
# $Log: Makefile.BeOS-R4,v $
-# Revision 1.1 1999/08/19 00:55:40 jtg
-# Initial revision
+# Revision 1.2 1999/09/17 00:08:31 brianp
+# link with -lGLU -lGL instead of -lMesaGLU -lMesaGL
+#
+# Revision 1.1.1.1 1999/08/19 00:55:40 jtg
+# Imported sources
#
# Revision 1.1 1999/02/25 02:13:06 brianp
# initial check-in
@@ -18,7 +21,7 @@
INCDIR = ../include
LIBDIR = ../lib
-GL_LIBS = -L$(LIBDIR) -L/boot/home/config/lib -Xlinker -rpath $(LIBDIR) -lbe -lglut -lMesaGLU -lMesaGL $(XLIBS)
+GL_LIBS = -L$(LIBDIR) -L/boot/home/config/lib -Xlinker -rpath $(LIBDIR) -lbe -lglut -lGLU -lGL $(XLIBS)
LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
diff --git a/progs/samples/Makefile.BeOS-R4 b/progs/samples/Makefile.BeOS-R4
index 2e1e804cca..3e1bfb605f 100644
--- a/progs/samples/Makefile.BeOS-R4
+++ b/progs/samples/Makefile.BeOS-R4
@@ -1,4 +1,4 @@
-# $Id: Makefile.BeOS-R4,v 1.1 1999/08/19 00:55:41 jtg Exp $
+# $Id: Makefile.BeOS-R4,v 1.2 1999/09/17 00:08:38 brianp Exp $
# Mesa 3-D graphics library
# Version: 3.1
@@ -17,7 +17,7 @@
INCDIR = ../include
LIBDIR = ../lib
-GL_LIBS = -L$(LIBDIR) -L/boot/home/config/lib -Xlinker -rpath $(LIBDIR) -lbe -lglut -lMesaGLU -lMesaGL $(XLIBS)
+GL_LIBS = -L$(LIBDIR) -L/boot/home/config/lib -Xlinker -rpath $(LIBDIR) -lbe -lglut -lGLU -lGL $(XLIBS)
LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)