Permalink
Browse files

GL: Make sure to use GLU headers.

* The HEADERS_DEPENDENCY isn't needed
  for GLU as Mesa is a dependency and requires
  GLU to build
* I actually didn't break the build,
  we were however using the Mesa GLU headers
  with the external GLU lib which could be bad
  • Loading branch information...
1 parent e85a274 commit 6308afb12c8cffbcdec43cd7d9453ec5a0b26fb0 @kallisti5 kallisti5 committed Nov 18, 2012
View
1 src/add-ons/screen_savers/flurry/Jamfile
@@ -1,4 +1,5 @@
SubDir HAIKU_TOP src add-ons screen_savers flurry ;
+SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
# For GCC2
View
1 src/add-ons/screen_savers/glife/Jamfile
@@ -1,4 +1,5 @@
SubDir HAIKU_TOP src add-ons screen_savers glife ;
+SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
SetSubDirSupportedPlatformsBeOSCompatible ;
View
1 src/apps/glteapot/Jamfile
@@ -1,4 +1,5 @@
SubDir HAIKU_TOP src apps glteapot ;
+SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
SetSubDirSupportedPlatformsBeOSCompatible ;
View
3 src/libs/glut/Jamfile
@@ -56,9 +56,6 @@ if $(HAIKU_GCC_VERSION[1]) < 3 {
}
-# Ensure GLU dependency is met
-Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ]
- : $(HAIKU_GLU_HEADERS_DEPENDENCY) ;
# Ensure Mesa dependency is met
Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ]
: $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
View
2 src/tests/kits/opengl/glinfo/Jamfile
@@ -1,5 +1,5 @@
SubDir HAIKU_TOP src tests kits opengl glinfo ;
-
+SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
# For GCC2

0 comments on commit 6308afb

Please sign in to comment.