From d39572a089b4fec55a5d90cec14aa565bb63e04c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 13 Apr 2023 11:16:19 +0200 Subject: [PATCH] Shaders: build Line.cpp on GLES2 as well. The UBO definitons are not tied to GL in any way, so they should be available always. MeshTools::generateLine() now is as well, and this made the tests fail to link on ES2 builds due to the debug operator not being present. --- src/Magnum/Shaders/CMakeLists.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Magnum/Shaders/CMakeLists.txt b/src/Magnum/Shaders/CMakeLists.txt index 66c1b7163..07eda4df9 100644 --- a/src/Magnum/Shaders/CMakeLists.txt +++ b/src/Magnum/Shaders/CMakeLists.txt @@ -43,6 +43,7 @@ set(MagnumShaders_SRCS set(MagnumShaders_GracefulAssert_SRCS DistanceFieldVectorGL.cpp FlatGL.cpp + Line.cpp MeshVisualizerGL.cpp PhongGL.cpp VectorGL.cpp @@ -57,6 +58,7 @@ set(MagnumShaders_HEADERS FlatGL.h Generic.h GenericGL.h + Line.h MeshVisualizer.h MeshVisualizerGL.h Phong.h @@ -71,19 +73,15 @@ set(MagnumShaders_HEADERS # Header files to display in project view of IDEs only set(MagnumShaders_PRIVATE_HEADERS - Implementation/CreateCompatibilityShader.h) + Implementation/CreateCompatibilityShader.h + Implementation/lineMiterLimit.h) if(NOT MAGNUM_TARGET_GLES2) list(APPEND MagnumShaders_GracefulAssert_SRCS - Line.cpp LineGL.cpp) list(APPEND MagnumShaders_HEADERS - Line.h LineGL.h) - - list(APPEND MagnumShaders_PRIVATE_HEADERS - Implementation/lineMiterLimit.h) endif() if(MAGNUM_BUILD_DEPRECATED)