From 67f3236e6acd62858cc0bfac393b16b4a12e262e Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Wed, 11 Jan 2012 22:01:01 -0600
Subject: [PATCH] glut: Ensure Mesa dependency is met before compiling

---
 src/libs/glut/Jamfile | 58 +++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/src/libs/glut/Jamfile b/src/libs/glut/Jamfile
index 645cb85648..62a275550e 100644
--- a/src/libs/glut/Jamfile
+++ b/src/libs/glut/Jamfile
@@ -9,28 +9,7 @@ if $(TARGET_PLATFORM) != haiku {
 }
 
 
-# For GCC2
-if $(HAIKU_GCC_VERSION[1]) < 3 {
-	SubDirC++Flags --no-warnings ;
-}
-
-
-MergeObject <opengl>glut.o :
-	# C++ sources
-	glutBlocker.cpp
-	glutInit.cpp
-	glutWindow.cpp
-	glutEvent.cpp
-	glutCallback.cpp
-	glutOverlay.cpp
-	glutGet.cpp
-	glutColor.cpp
-	glutCursor.cpp
-	glutMenu.cpp
-	glutDstr.cpp
-	glutGameMode.cpp
-	beos_x11.cpp
-
+local sourcesCc =
 	# C sources
 	glut_8x13.c
 	glut_9x15.c
@@ -51,3 +30,38 @@ MergeObject <opengl>glut.o :
 	glut_util.c
 	glut_ext.c
 ;
+
+
+local sourcesCpp =
+	glutBlocker.cpp
+	glutInit.cpp
+	glutWindow.cpp
+	glutEvent.cpp
+	glutCallback.cpp
+	glutOverlay.cpp
+	glutGet.cpp
+	glutColor.cpp
+	glutCursor.cpp
+	glutMenu.cpp
+	glutDstr.cpp
+	glutGameMode.cpp
+	beos_x11.cpp
+;
+
+
+# For GCC2
+if $(HAIKU_GCC_VERSION[1]) < 3 {
+	SubDirC++Flags --no-warnings ;
+}
+
+
+# Ensure Mesa dependency is met
+Includes [ FGristFiles $(sourcesCc) $(sourcesCpp) ]
+	: $(HAIKU_MESA_HEADERS_DEPENDENCY) ;
+
+MergeObject <opengl>glut.o :
+	# C++ sources
+	$(sourcesCpp)
+	# C sources
+	$(sourcesCc)
+;