From e26f90957cccd5dfbd3b0052a9eca14d7f5736a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 16 Apr 2021 17:20:54 +0200 Subject: [PATCH] Shaders: wait, how did the linker work for the whole decade?! No issue on GCC, only Clang and MSVC started failing once I renamed the shaders. These four are the only that don't have the export macro attached AND YET it somehow worked without any problem until now. --- src/Magnum/Shaders/DistanceFieldVectorGL.cpp | 4 ++-- src/Magnum/Shaders/FlatGL.cpp | 4 ++-- src/Magnum/Shaders/VectorGL.cpp | 4 ++-- src/Magnum/Shaders/VertexColorGL.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Magnum/Shaders/DistanceFieldVectorGL.cpp b/src/Magnum/Shaders/DistanceFieldVectorGL.cpp index 19c50301f..32c8e8795 100644 --- a/src/Magnum/Shaders/DistanceFieldVectorGL.cpp +++ b/src/Magnum/Shaders/DistanceFieldVectorGL.cpp @@ -145,8 +145,8 @@ template DistanceFieldVectorGL& DistanceFiel return *this; } -template class DistanceFieldVectorGL<2>; -template class DistanceFieldVectorGL<3>; +template class MAGNUM_SHADERS_EXPORT DistanceFieldVectorGL<2>; +template class MAGNUM_SHADERS_EXPORT DistanceFieldVectorGL<3>; namespace Implementation { diff --git a/src/Magnum/Shaders/FlatGL.cpp b/src/Magnum/Shaders/FlatGL.cpp index 3d9b1c79e..2501bf049 100644 --- a/src/Magnum/Shaders/FlatGL.cpp +++ b/src/Magnum/Shaders/FlatGL.cpp @@ -191,8 +191,8 @@ template FlatGL& FlatGL::setObje } #endif -template class FlatGL<2>; -template class FlatGL<3>; +template class MAGNUM_SHADERS_EXPORT FlatGL<2>; +template class MAGNUM_SHADERS_EXPORT FlatGL<3>; namespace Implementation { diff --git a/src/Magnum/Shaders/VectorGL.cpp b/src/Magnum/Shaders/VectorGL.cpp index 6e3a3fb68..d29cf4a1f 100644 --- a/src/Magnum/Shaders/VectorGL.cpp +++ b/src/Magnum/Shaders/VectorGL.cpp @@ -130,8 +130,8 @@ template VectorGL& VectorGL::set return *this; } -template class VectorGL<2>; -template class VectorGL<3>; +template class MAGNUM_SHADERS_EXPORT VectorGL<2>; +template class MAGNUM_SHADERS_EXPORT VectorGL<3>; namespace Implementation { diff --git a/src/Magnum/Shaders/VertexColorGL.cpp b/src/Magnum/Shaders/VertexColorGL.cpp index a767d74b4..311ae603d 100644 --- a/src/Magnum/Shaders/VertexColorGL.cpp +++ b/src/Magnum/Shaders/VertexColorGL.cpp @@ -97,7 +97,7 @@ template VertexColorGL& VertexColorGL; -template class VertexColorGL<3>; +template class MAGNUM_SHADERS_EXPORT VertexColorGL<2>; +template class MAGNUM_SHADERS_EXPORT VertexColorGL<3>; }}