diff options
| author | Brian Paul <[email protected]> | 1999-09-17 00:07:26 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 1999-09-17 00:07:26 +0000 |
| commit | 738e9775800c0dd363c0ebef5dc439cbe4911155 (patch) | |
| tree | 8fca744add1e73bcd2793ecf94030c89d00d4f6c | |
| parent | f33e6b1e83253147c07404b7e088236dbca04ca6 (diff) | |
link with -lGLU -lGL instead of -lMesaGLU -lMesaGL
| -rw-r--r-- | progs/demos/Makefile.BeOS-R4 | 11 | ||||
| -rw-r--r-- | progs/redbook/Makefile.BeOS-R4 | 11 | ||||
| -rw-r--r-- | progs/samples/Makefile.BeOS-R4 | 4 |
3 files changed, 16 insertions, 10 deletions
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) |