From 83435611c892d4bdc90a193f9cd90fd74334a0af Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 22 Oct 1999 20:35:17 +0000 Subject: added gloss demo --- progs/demos/Makefile.BeOS-R4 | 43 ++----------------------------------------- progs/demos/Makefile.X11 | 6 +++--- progs/demos/Makefile.cygnus | 42 +++++++++--------------------------------- 3 files changed, 14 insertions(+), 77 deletions(-) diff --git a/progs/demos/Makefile.BeOS-R4 b/progs/demos/Makefile.BeOS-R4 index b7b48ec84c..ddc9a22834 100644 --- a/progs/demos/Makefile.BeOS-R4 +++ b/progs/demos/Makefile.BeOS-R4 @@ -1,52 +1,13 @@ -# $Id: Makefile.BeOS-R4,v 1.2 1999/09/17 00:07:26 brianp Exp $ +# $Id: Makefile.BeOS-R4,v 1.3 1999/10/22 20:36:38 brianp Exp $ # Mesa 3-D graphics library # Version: 3.1 # Copyright (C) 1995-1999 Brian Paul -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # Makefile for GLUT-based demo programs for BeOS R4 -# $Log: Makefile.BeOS-R4,v $ -# 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 -# -# Revision 1.4 1999/02/03 03:57:26 brianp -# replace multiext with multiarb -# -# Revision 1.3 1999/02/02 04:47:45 brianp -# removed glutfx from targets -# -# Revision 1.2 1999/02/02 04:46:23 brianp -# removed tessdemo from targets -# -# Revision 1.1 1999/02/02 04:43:27 brianp -# Initial revision -# - - - ##### MACROS ##### INCDIR = ../include @@ -56,7 +17,7 @@ GL_LIBS = -L$(LIBDIR) -L/boot/home/config/lib -Xlinker -rpath $(LIBDIR) -lbe -lg LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB) -PROGS = bounce clearspd drawpix gamma gears glinfo isosurf \ +PROGS = bounce clearspd drawpix gamma gears glinfo gloss isosurf \ morph3d multiarb osdemo paltex pointblast reflect \ renormal spectex stex3d texcyl texobj trispd winpos diff --git a/progs/demos/Makefile.X11 b/progs/demos/Makefile.X11 index 9d475a6ac0..ac663aae39 100644 --- a/progs/demos/Makefile.X11 +++ b/progs/demos/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.1 1999/08/19 00:55:40 jtg Exp $ +# $Id: Makefile.X11,v 1.2 1999/10/22 20:35:17 brianp Exp $ # Mesa 3-D graphics library # Version: 3.1 @@ -17,9 +17,9 @@ GL_LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lm $(XLIBS) LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB) -PROGS = bounce clearspd drawpix gamma gears glinfo glutfx isosurf \ +PROGS = bounce clearspd drawpix gamma gears glinfo gloss glutfx isosurf \ morph3d multiarb osdemo paltex pointblast reflect \ - renormal spectex stex3d tessdemo texcyl texobj trispd winpos + renormal spectex stex3d tessdemo texcyl texobj trispd winpos \ ##### RULES ##### diff --git a/progs/demos/Makefile.cygnus b/progs/demos/Makefile.cygnus index 69012b13be..dee1e89453 100644 --- a/progs/demos/Makefile.cygnus +++ b/progs/demos/Makefile.cygnus @@ -1,37 +1,13 @@ -# Makefile for demo programs -# Stephane Rehel (rehel@worldnet.fr) April 13 1997 +# $Id: Makefile.cygnus,v 1.2 1999/10/22 20:37:23 brianp Exp $ # Mesa 3-D graphics library -# Version: 3.0 -# Copyright (C) 1995-1998 Brian Paul -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - -# $Id: Makefile.cygnus,v 1.1 1999/08/19 00:55:40 jtg Exp $ - -# $Log: Makefile.cygnus,v $ -# Revision 1.1 1999/08/19 00:55:40 jtg -# Initial revision -# -# Revision 3.1 1999/06/22 12:50:29 brianp -# removed multitex demo -# -# Revision 3.0 1998/06/10 02:55:51 brianp -# initial revision -# +# Version: 3.1 +# Copyright (C) 1995-1999 Brian Paul + + +# Makefile for demo programs for cygnus +# Stephane Rehel (rehel@worldnet.fr) April 13 1997 + ##### MACROS ##### @@ -43,7 +19,7 @@ GL_LIBS = -L$(LIBDIR) -lglut -lMesaGLU -lMesaGL -lm $(WLIBS) LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB) -PROGS = clearspd drawpix gamma gears glinfo glutfx isosurf \ +PROGS = clearspd drawpix gamma gears glinfo glutfx gloss isosurf \ morph3d multiext osdemo paltex pointblast reflect \ renormal spectex stex3d tessdemo texcyl texobj trispd winpos -- cgit v1.2.3