i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GL: Make sure to use GLU headers.

Browse Source 
* 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
This commit is contained in:
Alexander von Gluck IV
2012-11-18 08:22:38 -06:00
parent e85a27423c
commit 6308afb12c
5 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/screen_savers/flurry/Jamfile
+1
View File
@@ -1,4 +1,5 @@
SubDir HAIKU_TOP src add-ons screen_savers flurry ; SubDir HAIKU_TOP src add-ons screen_savers flurry ;
SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
# For GCC2 # For GCC2
src/add-ons/screen_savers/glife/Jamfile
+1
View File
@@ -1,4 +1,5 @@
SubDir HAIKU_TOP src add-ons screen_savers glife ; SubDir HAIKU_TOP src add-ons screen_savers glife ;
SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
src/apps/glteapot/Jamfile
+1
View File
@@ -1,4 +1,5 @@
SubDir HAIKU_TOP src apps glteapot ; SubDir HAIKU_TOP src apps glteapot ;
SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
src/libs/glut/Jamfile
-3
View File
@@ -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 # Ensure Mesa dependency is met
Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ] Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ]
: $(HAIKU_MESA_HEADERS_DEPENDENCY) ; : $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
src/tests/kits/opengl/glinfo/Jamfile
+1 -1
View File
@@ -1,5 +1,5 @@
SubDir HAIKU_TOP src tests kits opengl glinfo ; SubDir HAIKU_TOP src tests kits opengl glinfo ;
SubDirSysHdrs $(HAIKU_GLU_HEADERS) ;
SubDirSysHdrs $(HAIKU_MESA_HEADERS) ; SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
# For GCC2 # For GCC2