[haiku-commits] haiku: hrev43651 - src/apps/haiku3d src/apps/haiku3d/texture build/jam
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 11 Jan 2012 07:20:20 +0100 (CET)
hrev43651 adds 2 changesets to branch 'master'
old head: 683e7cc8455332d1b70d5b6e6313cfd6c9220e19
new head: 8e4cdaae8de3c1b36dc31bb76587b46986c93014
----------------------------------------------------------------------------
defd6ec: mesa: Bump gcc4 optional package to 8.0-devel
8e4cdaa: haiku3d: Fix haiku3d build
* Add GL header include path
* Remove strange GL include path from sources
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
8 files changed, 16 insertions(+), 10 deletions(-)
build/jam/OptionalBuildFeatures | 2 +-
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 ++--
############################################################################
Commit: defd6ec79a869286222e2cac76efd60c8471f6d2
URL: http://cgit.haiku-os.org/haiku/commit/?id=defd6ec
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Jan 11 06:14:54 2012 UTC
mesa: Bump gcc4 optional package to 8.0-devel
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index a6fd9cc..d9709a6 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -175,7 +175,7 @@ local mesaBaseURL = http://pub.haikufire.com/mesa ;
if $(TARGET_ARCH) = x86 {
local zipFile ;
if $(HAIKU_GCC_VERSION[1]) >= 4 {
- HAIKU_MESA_FILE = mesa-71cc639-gcc4-x86.zip ;
+ HAIKU_MESA_FILE = mesa-8.0-devel-gcc4-x86.zip ;
} else {
HAIKU_MESA_FILE = mesa-7.8.2-gcc2-x86.zip ;
}
############################################################################
Revision: hrev43651
Commit: 8e4cdaae8de3c1b36dc31bb76587b46986c93014
URL: http://cgit.haiku-os.org/haiku/commit/?id=8e4cdaa
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Jan 11 06:20:02 2012 UTC
haiku3d: Fix haiku3d build
* Add GL header include path
* Remove strange GL include path from sources
----------------------------------------------------------------------------
diff --git a/src/apps/haiku3d/Jamfile b/src/apps/haiku3d/Jamfile
index 63d104b..b025da6 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 9adb5ca..c270237 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 1173dfd..44f8427 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 6893d93..76b2057 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 635b871..7271343 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 aac6928..654c910 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 7c90668..8363469 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>
Other related posts:
- » [haiku-commits] haiku: hrev43651 - src/apps/haiku3d src/apps/haiku3d/texture build/jam - kallisti5
