[haiku-commits] haiku: hrev43653 - src/libs/glut
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 12 Jan 2012 05:04:56 +0100 (CET)
hrev43653 adds 1 changeset to branch 'master'
old head: 367834c6bae9bc2a41c4f4cd8e7292021f16e7e8
new head: 67f3236e6acd62858cc0bfac393b16b4a12e262e
----------------------------------------------------------------------------
67f3236: glut: Ensure Mesa dependency is met before compiling
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev43653
Commit: 67f3236e6acd62858cc0bfac393b16b4a12e262e
URL: http://cgit.haiku-os.org/haiku/commit/?id=67f3236
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Thu Jan 12 04:01:01 2012 UTC
----------------------------------------------------------------------------
1 files changed, 36 insertions(+), 22 deletions(-)
src/libs/glut/Jamfile | 58 ++++++++++++++++++++++++++++-----------------
----------------------------------------------------------------------------
diff --git a/src/libs/glut/Jamfile b/src/libs/glut/Jamfile
index 645cb85..62a2755 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)
+;
Other related posts:
- » [haiku-commits] haiku: hrev43653 - src/libs/glut - kallisti5
