From 0611f5856997c0aa3f1464d9a3c28a5da6f3d256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 27 Nov 2013 23:42:51 +0100 Subject: [PATCH] Shaders: fix tests in static build. --- src/Shaders/Test/DistanceFieldVectorGLTest.cpp | 4 ++++ src/Shaders/Test/FlatGLTest.cpp | 4 ++++ src/Shaders/Test/MeshVisualizerGLTest.cpp | 4 ++++ src/Shaders/Test/PhongGLTest.cpp | 4 ++++ src/Shaders/Test/VectorGLTest.cpp | 4 ++++ src/Shaders/Test/VertexColorGLTest.cpp | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/src/Shaders/Test/DistanceFieldVectorGLTest.cpp b/src/Shaders/Test/DistanceFieldVectorGLTest.cpp index 0e6bc2598..6616f2fab 100644 --- a/src/Shaders/Test/DistanceFieldVectorGLTest.cpp +++ b/src/Shaders/Test/DistanceFieldVectorGLTest.cpp @@ -25,6 +25,10 @@ #include "Shaders/DistanceFieldVector.h" #include "Test/AbstractOpenGLTester.h" +#ifdef MAGNUM_BUILD_STATIC +#include "Shaders/magnumShadersResourceImport.hpp" +#endif + namespace Magnum { namespace Shaders { namespace Test { class DistanceFieldVectorGLTest: public Magnum::Test::AbstractOpenGLTester { diff --git a/src/Shaders/Test/FlatGLTest.cpp b/src/Shaders/Test/FlatGLTest.cpp index 08be1e375..f0a47d5e2 100644 --- a/src/Shaders/Test/FlatGLTest.cpp +++ b/src/Shaders/Test/FlatGLTest.cpp @@ -25,6 +25,10 @@ #include "Shaders/Flat.h" #include "Test/AbstractOpenGLTester.h" +#ifdef MAGNUM_BUILD_STATIC +#include "Shaders/magnumShadersResourceImport.hpp" +#endif + namespace Magnum { namespace Shaders { namespace Test { class FlatGLTest: public Magnum::Test::AbstractOpenGLTester { diff --git a/src/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Shaders/Test/MeshVisualizerGLTest.cpp index 1b7b12c42..1a28c3a57 100644 --- a/src/Shaders/Test/MeshVisualizerGLTest.cpp +++ b/src/Shaders/Test/MeshVisualizerGLTest.cpp @@ -27,6 +27,10 @@ #include "Shaders/MeshVisualizer.h" #include "Test/AbstractOpenGLTester.h" +#ifdef MAGNUM_BUILD_STATIC +#include "Shaders/magnumShadersResourceImport.hpp" +#endif + namespace Magnum { namespace Shaders { namespace Test { class MeshVisualizerGLTest: public Magnum::Test::AbstractOpenGLTester { diff --git a/src/Shaders/Test/PhongGLTest.cpp b/src/Shaders/Test/PhongGLTest.cpp index 5e6f79fa5..87c1ffbca 100644 --- a/src/Shaders/Test/PhongGLTest.cpp +++ b/src/Shaders/Test/PhongGLTest.cpp @@ -25,6 +25,10 @@ #include "Shaders/Phong.h" #include "Test/AbstractOpenGLTester.h" +#ifdef MAGNUM_BUILD_STATIC +#include "Shaders/magnumShadersResourceImport.hpp" +#endif + namespace Magnum { namespace Shaders { namespace Test { class PhongGLTest: public Magnum::Test::AbstractOpenGLTester { diff --git a/src/Shaders/Test/VectorGLTest.cpp b/src/Shaders/Test/VectorGLTest.cpp index ed187caab..c69d706de 100644 --- a/src/Shaders/Test/VectorGLTest.cpp +++ b/src/Shaders/Test/VectorGLTest.cpp @@ -25,6 +25,10 @@ #include "Shaders/Vector.h" #include "Test/AbstractOpenGLTester.h" +#ifdef MAGNUM_BUILD_STATIC +#include "Shaders/magnumShadersResourceImport.hpp" +#endif + namespace Magnum { namespace Shaders { namespace Test { class VectorGLTest: public Magnum::Test::AbstractOpenGLTester { diff --git a/src/Shaders/Test/VertexColorGLTest.cpp b/src/Shaders/Test/VertexColorGLTest.cpp index e0e381d4f..971fd555a 100644 --- a/src/Shaders/Test/VertexColorGLTest.cpp +++ b/src/Shaders/Test/VertexColorGLTest.cpp @@ -25,6 +25,10 @@ #include "Shaders/VertexColor.h" #include "Test/AbstractOpenGLTester.h" +#ifdef MAGNUM_BUILD_STATIC +#include "Shaders/magnumShadersResourceImport.hpp" +#endif + namespace Magnum { namespace Shaders { namespace Test { class VertexColorGLTest: public Magnum::Test::AbstractOpenGLTester {