From 9b531940b96dbe1c46eb41b201d32eafbfcfa017 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Sun, 26 Jun 2005 15:53:49 +0000 Subject: [PATCH] Link against native libGL.so. Native OpenGL headers too. Changed the app signature to match resource one. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13282 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/glteapot/Jamfile | 8 +++----- src/apps/glteapot/teapot_main.cpp | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/apps/glteapot/Jamfile b/src/apps/glteapot/Jamfile index d465a437bd..1d3e2d5905 100644 --- a/src/apps/glteapot/Jamfile +++ b/src/apps/glteapot/Jamfile @@ -1,15 +1,13 @@ SubDir OBOS_TOP src apps glteapot ; -#TODO we should have our own opengl headers -SubDirHdrs [ FDirName / boot develop headers be opengl ] ; - -#TODO we should have our own libGL.so App GLTeapot : FPS.cpp GLObject.cpp ObjectView.cpp error.cpp teapot_main.cpp - : libbe.so GL libgame.so + + : libbe.so libGL.so libgame.so + : GLTeapot.rdef ; diff --git a/src/apps/glteapot/teapot_main.cpp b/src/apps/glteapot/teapot_main.cpp index 5b8ab8b71e..6600745320 100644 --- a/src/apps/glteapot/teapot_main.cpp +++ b/src/apps/glteapot/teapot_main.cpp @@ -44,7 +44,7 @@ int main(int argc, char **argv) //GLenum type = BGL_RGB | BGL_DEPTH | BGL_SINGLE; BRect r(0,0,300,315); - BApplication *app = new BApplication("application/x-vnd.Be-tpot"); + BApplication *app = new BApplication("application/x-vnd.Haiku-teapot"); r.OffsetTo(BPoint(100,100)); QuitWindow *win = new QuitWindow(r,"GLTeapot",B_TITLED_WINDOW,0);