From 56e7f623a374e502714f9f459801f84b4f10b5e7 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 26 Dec 2013 23:47:32 -0600 Subject: [PATCH] tests/glsl: Fix glsl OpenGL test build --- src/tests/kits/opengl/glsl/Jamfile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/tests/kits/opengl/glsl/Jamfile b/src/tests/kits/opengl/glsl/Jamfile index cdac47678f..75159f0055 100644 --- a/src/tests/kits/opengl/glsl/Jamfile +++ b/src/tests/kits/opengl/glsl/Jamfile @@ -1,21 +1,17 @@ SubDir HAIKU_TOP src tests kits opengl glsl ; UseBuildFeatureHeaders mesa ; - -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 shadersources = shaderutil.c ; Includes [ FGristFiles $(shadersources) ] - : [ BuildFeatureAttribute mesa : headers ] ; + : + [ BuildFeatureAttribute mesa : headers ] + [ BuildFeatureAttribute glu : headers ] +; StaticLibrary libshaderutil.a : $(shadersources) @@ -24,6 +20,7 @@ StaticLibrary libshaderutil.a : SimpleTest brick : brick.c : - libshaderutil.a be + libshaderutil.a be libglut.so [ BuildFeatureAttribute mesa : library ] + [ BuildFeatureAttribute glu : library ] ;