From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 17 Sep 1999 00:07:26 +0000 (+0000)
Subject: link with -lGLU -lGL instead of -lMesaGLU -lMesaGL
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=738e9775800c0dd363c0ebef5dc439cbe4911155;p=mesa.git

link with -lGLU -lGL instead of -lMesaGLU -lMesaGL
---

diff --git a/progs/demos/Makefile.BeOS-R4 b/progs/demos/Makefile.BeOS-R4
index c0d990e4a07..b7b48ec84ce 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 f99e8edf4c6..4f6734e67b0 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 2e1e804cca7..3e1bfb605fb 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)