From f17ddd4884cccdbd15e7a3bebaeec32de4b6658e Mon Sep 17 00:00:00 2001
From: Philippe Houdoin <phoudoin@freedesktop.org>
Date: Sat, 14 Aug 2004 09:59:16 +0000
Subject: Fix demo.cpp, which wasn't working as expected. Add a GLInfo app, a
 graphical tool displaying GL Info as a treeview. Usefull to see which OpenGL
 renderer you use and which extension(s) is supported. Convert the Makefile to
 be $(TOP)/configs/default-based.

---
 progs/beos/Makefile | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

(limited to 'progs/beos/Makefile')

diff --git a/progs/beos/Makefile b/progs/beos/Makefile
index 6fa6d8fd9b..fae54160c4 100644
--- a/progs/beos/Makefile
+++ b/progs/beos/Makefile
@@ -1,42 +1,31 @@
-# $Id: Makefile,v 1.2 1999/09/17 00:55:21 brianp Exp $
+# progs/beos/Makefile
+
+TOP = ../..
+include $(TOP)/configs/current
 
 # Makefile for BeOS demos
 
 # Written by Brian Paul
 # This file is in the public domain.
+#
+# Modified by Philippe Houdoin
 
+LDFLAGS += -soname=_APP_ $(APP_LIB_DEPS)
 
-
-CC = g++
-
-# Use Mesa:
-CFLAGS = -I../include -c -g
-LFLAGS = -L../lib  -Xlinker -rpath ../lib -lbe -lGL
-
-# Use BeOS OpenGL:
-#CFLAGS = -I/boot/develop/headers/be/opengl -c -g
-#LFLAGS = -L../lib  -Xlinker -rpath ../lib -lbe -lGL
-
-
-PROGRAMS = demo sample
-
-default: $(PROGRAMS)
-
+default: demo sample GLInfo
 
 clean:
-	rm -f demo sample
+	rm -f demo sample GLInfo
 	rm -f *.o
 
-
 demo: demo.o
-	$(CC) demo.o $(LFLAGS) -o $@
-
-demo.o: demo.cpp
-	$(CC) $(CFLAGS) demo.cpp
-
+	$(LD) demo.o $(LDFLAGS) -o $@
 
 sample: sample.o
-	$(CC) sample.o $(LFLAGS) -o $@
+	$(LD) sample.o $(LDFLAGS) -o $@
+
+GTLInfo: GLInfo.o
+	$(LD) GLInfo.o $(LDFLAGS) -o $@
 
-sample.o: sample.cpp
-	$(CC) $(CFLAGS) sample.cpp
+.cpp.o:
+	$(CC) -c $< $(CFLAGS) -o $@
-- 
cgit v1.2.3