From 8e4cdaae8de3c1b36dc31bb76587b46986c93014 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Wed, 11 Jan 2012 00:20:02 -0600
Subject: [PATCH] haiku3d: Fix haiku3d build

* Add GL header include path
* Remove strange GL include path from sources
---
 src/apps/haiku3d/Jamfile                      | 6 ++++++
 src/apps/haiku3d/MeshInstance.cpp             | 2 +-
 src/apps/haiku3d/RenderView.cpp               | 4 ++--
 src/apps/haiku3d/Texture.cpp                  | 2 +-
 src/apps/haiku3d/Texture.h                    | 2 +-
 src/apps/haiku3d/texture/BitmapTexture.cpp    | 4 ++--
 src/apps/haiku3d/texture/VideoFileTexture.cpp | 4 ++--
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/apps/haiku3d/Jamfile b/src/apps/haiku3d/Jamfile
index 63d104b640..b025da6ff0 100644
--- a/src/apps/haiku3d/Jamfile
+++ b/src/apps/haiku3d/Jamfile
@@ -1,8 +1,14 @@
 SubDir HAIKU_TOP src apps haiku3d ;
+SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) mesh ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) texture ] ;
 
+# For GCC2
+if $(HAIKU_GCC_VERSION[1]) < 3 {
+	SubDirC++Flags --no-warnings ;
+}
+
 UsePrivateHeaders shared ;
 
 Application Haiku3d :
diff --git a/src/apps/haiku3d/MeshInstance.cpp b/src/apps/haiku3d/MeshInstance.cpp
index 9adb5cadba..c270237a8d 100644
--- a/src/apps/haiku3d/MeshInstance.cpp
+++ b/src/apps/haiku3d/MeshInstance.cpp
@@ -8,7 +8,7 @@
 
 #include "MeshInstance.h"
 #include "MathUtils.h"
-#include <opengl/GL/gl.h>
+#include <GL/gl.h>
 
 //#include <stdio.h> // debug
 
diff --git a/src/apps/haiku3d/RenderView.cpp b/src/apps/haiku3d/RenderView.cpp
index 1173dfd113..44f8427937 100644
--- a/src/apps/haiku3d/RenderView.cpp
+++ b/src/apps/haiku3d/RenderView.cpp
@@ -14,8 +14,8 @@
 #include "StaticMesh.h"
 #include "VideoFileTexture.h"
 
-#include <opengl/GL/gl.h>
-#include <opengl/GL/glu.h>
+#include <GL/gl.h>
+#include <GL/glu.h>
 
 #include <TranslationKit.h>
 #include <TranslationUtils.h>
diff --git a/src/apps/haiku3d/Texture.cpp b/src/apps/haiku3d/Texture.cpp
index 6893d93afc..76b20575ca 100644
--- a/src/apps/haiku3d/Texture.cpp
+++ b/src/apps/haiku3d/Texture.cpp
@@ -8,7 +8,7 @@
 
 #include "Texture.h"
 
-#include <opengl/GL/gl.h>
+#include <GL/gl.h>
 
 
 Texture::Texture()
diff --git a/src/apps/haiku3d/Texture.h b/src/apps/haiku3d/Texture.h
index 635b8717fe..72713437d3 100644
--- a/src/apps/haiku3d/Texture.h
+++ b/src/apps/haiku3d/Texture.h
@@ -10,7 +10,7 @@
 
 #include <Referenceable.h>
 
-#include <opengl/GL/gl.h>
+#include <GL/gl.h>
 
 
 class Texture : public BReferenceable {
diff --git a/src/apps/haiku3d/texture/BitmapTexture.cpp b/src/apps/haiku3d/texture/BitmapTexture.cpp
index aac6928607..654c9107d4 100644
--- a/src/apps/haiku3d/texture/BitmapTexture.cpp
+++ b/src/apps/haiku3d/texture/BitmapTexture.cpp
@@ -10,8 +10,8 @@
 
 #include <Bitmap.h>
 
-#include <opengl/GL/gl.h>
-#include <opengl/GL/glu.h>
+#include <GL/gl.h>
+#include <GL/glu.h>
 #include <stdio.h>
 
 
diff --git a/src/apps/haiku3d/texture/VideoFileTexture.cpp b/src/apps/haiku3d/texture/VideoFileTexture.cpp
index 7c9066839f..836346920a 100644
--- a/src/apps/haiku3d/texture/VideoFileTexture.cpp
+++ b/src/apps/haiku3d/texture/VideoFileTexture.cpp
@@ -13,8 +13,8 @@
 #include <MediaFile.h>
 #include <MediaTrack.h>
 
-#include <opengl/GL/gl.h>
-#include <opengl/GL/glu.h>
+#include <GL/gl.h>
+#include <GL/glu.h>
 #include <string.h>
 #include <stdio.h>