[haiku-commits] haiku: hrev43652 - src/libs/glut build/jam src/kits/opengl
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 11 Jan 2012 23:47:47 +0100 (CET)
hrev43652 adds 2 changesets to branch 'master'
old head: 8e4cdaae8de3c1b36dc31bb76587b46986c93014
new head: 367834c6bae9bc2a41c4f4cd8e7292021f16e7e8
----------------------------------------------------------------------------
7b2c1ed: glut: build and link into libGL
367834c: mesa: include GL public headers in image
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
5 files changed, 18 insertions(+), 1 deletions(-)
build/jam/HaikuImage | 4 ++++
src/kits/opengl/Jamfile | 5 ++++-
src/libs/glut/Jamfile | 8 ++++++++
src/libs/glut/glutEvent.cpp | 1 +
src/libs/glut/glutGameMode.cpp | 1 +
############################################################################
Commit: 7b2c1ed631dcdda3d9a6f8c9dce42539eefbd965
URL: http://cgit.haiku-os.org/haiku/commit/?id=7b2c1ed
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Jan 11 22:55:15 2012 UTC
glut: build and link into libGL
----------------------------------------------------------------------------
diff --git a/src/kits/opengl/Jamfile b/src/kits/opengl/Jamfile
index 42e54b4..c18cb65 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 8558018..645cb85 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 5c4709e..3e5b920 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 1e55862..dada421 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
############################################################################
Revision: hrev43652
Commit: 367834c6bae9bc2a41c4f4cd8e7292021f16e7e8
URL: http://cgit.haiku-os.org/haiku/commit/?id=367834c
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Wed Jan 11 22:56:28 2012 UTC
mesa: include GL public headers in image
----------------------------------------------------------------------------
diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index c902532..ebbac1c 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -708,6 +708,10 @@ CopyDirectoryToHaikuImage develop sample-code
: [ FDirName $(HAIKU_TOP) src libs pdflib bind pdflib ]
: pdflib : -x .svn ;
+# Copy Mesa3D GL headers into image
+CopyDirectoryToHaikuImage develop headers os opengl
+ : [ FDirName $(HAIKU_MESA_HEADERS) GL ] : : -x .svn ;
+
#pragma mark - Optional Packages
Other related posts:
- » [haiku-commits] haiku: hrev43652 - src/libs/glut build/jam src/kits/opengl - kallisti5
