From 733ea4057e3e44b66a44b0f34029377454c08fd1 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 26 Dec 2013 23:49:54 -0600 Subject: [PATCH] tests/glut: Fix glut OpenGL test build --- src/tests/kits/opengl/glut/game_mode/Jamfile | 21 ++++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/tests/kits/opengl/glut/game_mode/Jamfile b/src/tests/kits/opengl/glut/game_mode/Jamfile index 786464a84e..f24c490a5f 100644 --- a/src/tests/kits/opengl/glut/game_mode/Jamfile +++ b/src/tests/kits/opengl/glut/game_mode/Jamfile @@ -1,27 +1,22 @@ SubDir HAIKU_TOP src tests kits opengl glut game_mode ; UseBuildFeatureHeaders mesa ; - -# GLUT -UseHeaders [ FDirName $(HAIKU_TOP) headers os opengl ] ; - -SetSubDirSupportedPlatformsBeOSCompatible ; - -if $(TARGET_PLATFORM) != haiku { - # Needed for , not present in R5. - # Unfortunately we also get the other headers there, - # that we don't really want. - UsePublicHeaders opengl ; -} +UseBuildFeatureHeaders glu ; +UseLibraryHeaders glut ; local sources = game_mode.c ; -Includes [ FGristFiles $(sources) ] : [ BuildFeatureAttribute mesa : headers ] ; +Includes [ FGristFiles $(sources) ] + : + [ BuildFeatureAttribute mesa : headers ] + [ BuildFeatureAttribute glu : headers ] +; SimpleTest GLUTGameMode : $(sources) : be libglut.so [ BuildFeatureAttribute mesa : library ] + [ BuildFeatureAttribute glu : library ] ;