Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haiku3d: Fix haiku3d build 

* Add GL header include path
* Remove strange GL include path from sources
This commit is contained in:
Alexander von Gluck IV 2012-01-11 00:20:02 -06:00
parent defd6ec79a
commit 8e4cdaae8d
7 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/apps/haiku3d/Jamfile
View File

@ -1,8 +1,14 @@
SubDir HAIKU_TOP src apps haiku3d ; SubDir HAIKU_TOP src apps haiku3d ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) mesh ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) mesh ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) texture ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) texture ] ;
# For GCC2
if $(HAIKU_GCC_VERSION[1]) < 3 {
SubDirC++Flags --no-warnings ;
}
UsePrivateHeaders shared ; UsePrivateHeaders shared ;
Application Haiku3d : Application Haiku3d :

2
src/apps/haiku3d/MeshInstance.cpp
View File

@ -8,7 +8,7 @@
#include "MeshInstance.h" #include "MeshInstance.h"
#include "MathUtils.h" #include "MathUtils.h"
#include <opengl/GL/gl.h> #include <GL/gl.h>
//#include <stdio.h> // debug //#include <stdio.h> // debug

4
src/apps/haiku3d/RenderView.cpp
View File

@ -14,8 +14,8 @@
#include "StaticMesh.h" #include "StaticMesh.h"
#include "VideoFileTexture.h" #include "VideoFileTexture.h"
#include <opengl/GL/gl.h> #include <GL/gl.h>
#include <opengl/GL/glu.h> #include <GL/glu.h>
#include <TranslationKit.h> #include <TranslationKit.h>
#include <TranslationUtils.h> #include <TranslationUtils.h>

2
src/apps/haiku3d/Texture.cpp
View File

@ -8,7 +8,7 @@
#include "Texture.h" #include "Texture.h"
#include <opengl/GL/gl.h> #include <GL/gl.h>
Texture::Texture() Texture::Texture()

2
src/apps/haiku3d/Texture.h
View File

@ -10,7 +10,7 @@
#include <Referenceable.h> #include <Referenceable.h>
#include <opengl/GL/gl.h> #include <GL/gl.h>
class Texture : public BReferenceable { class Texture : public BReferenceable {

4
src/apps/haiku3d/texture/BitmapTexture.cpp
View File

@ -10,8 +10,8 @@
#include <Bitmap.h> #include <Bitmap.h>
#include <opengl/GL/gl.h> #include <GL/gl.h>
#include <opengl/GL/glu.h> #include <GL/glu.h>
#include <stdio.h> #include <stdio.h>

4
src/apps/haiku3d/texture/VideoFileTexture.cpp
View File

@ -13,8 +13,8 @@
#include <MediaFile.h> #include <MediaFile.h>
#include <MediaTrack.h> #include <MediaTrack.h>
#include <opengl/GL/gl.h> #include <GL/gl.h>
#include <opengl/GL/glu.h> #include <GL/glu.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>