From 7b2c1ed631dcdda3d9a6f8c9dce42539eefbd965 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Wed, 11 Jan 2012 16:55:15 -0600
Subject: [PATCH] glut: build and link into libGL

---
 src/kits/opengl/Jamfile        | 5 ++++-
 src/libs/glut/Jamfile          | 8 ++++++++
 src/libs/glut/glutEvent.cpp    | 1 +
 src/libs/glut/glutGameMode.cpp | 1 +
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/kits/opengl/Jamfile b/src/kits/opengl/Jamfile
index 42e54b4fd0..c18cb651d9 100644
--- a/src/kits/opengl/Jamfile
+++ b/src/kits/opengl/Jamfile
@@ -38,13 +38,16 @@ LINKFLAGS on libGL.so = [ on libGL.so return $(LINKFLAGS) ]
 if $(HAIKU_GCC_VERSION[1]) < 3 {
 	SubDirC++Flags --no-warnings ;
 }
-	
+
 
 SharedLibrary libGL.so : $(sources) :
 
 	# Mesa libraries (from Mesa optional package):
 	$(HAIKU_MESA_LIBS)
 
+	# Glut
+	<opengl>glut.o
+
 	# External libraries:
 	be
 	game			# BWindowScreen needed by BGLScreen stub class
diff --git a/src/libs/glut/Jamfile b/src/libs/glut/Jamfile
index 8558018557..645cb85648 100644
--- a/src/libs/glut/Jamfile
+++ b/src/libs/glut/Jamfile
@@ -1,4 +1,5 @@
 SubDir HAIKU_TOP src libs glut ;
+SubDirSysHdrs $(HAIKU_MESA_HEADERS) ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
@@ -7,6 +8,13 @@ if $(TARGET_PLATFORM) != haiku {
 		# We need our public GL headers also when not compiling for Haiku.
 }
 
+
+# For GCC2
+if $(HAIKU_GCC_VERSION[1]) < 3 {
+	SubDirC++Flags --no-warnings ;
+}
+
+
 MergeObject <opengl>glut.o :
 	# C++ sources
 	glutBlocker.cpp
diff --git a/src/libs/glut/glutEvent.cpp b/src/libs/glut/glutEvent.cpp
index 5c4709e10c..3e5b920d81 100644
--- a/src/libs/glut/glutEvent.cpp
+++ b/src/libs/glut/glutEvent.cpp
@@ -19,6 +19,7 @@
 #include "glutState.h"
 #include "glutBlocker.h"
 #include <stdio.h>
+#include <stdlib.h>
 
 #define MOUSE_WHEEL_UP   3
 #define MOUSE_WHEEL_DOWN 4
diff --git a/src/libs/glut/glutGameMode.cpp b/src/libs/glut/glutGameMode.cpp
index 1e5586223f..dada4212ac 100644
--- a/src/libs/glut/glutGameMode.cpp
+++ b/src/libs/glut/glutGameMode.cpp
@@ -14,6 +14,7 @@
 #include <GL/glut.h>
 #include <String.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 
 // GlutGameMode class