Adapted to Corrade changes.

src/Shaders/CMakeLists.txt

@@ -22,14 +22,7 @@
 #   DEALINGS IN THE SOFTWARE.
 #
 
-corrade_add_resource(MagnumShaders_RCS MagnumShaders
+corrade_add_resource(MagnumShaders_RCS resources.conf)
-    AbstractVector2D.vert AbstractVector3D.vert
-    Flat2D.vert Flat3D.vert Flat.frag
-    MeshVisualizer.vert MeshVisualizer.geom MeshVisualizer.frag
-    Phong.vert Phong.frag
-    Vector.frag DistanceFieldVector.frag
-    VertexColor2D.vert VertexColor3D.vert VertexColor.frag
-    compatibility.glsl)
 
 set(MagnumShaders_SRCS
     DistanceFieldVector.cpp

src/Shaders/magnumShadersResourceImport.hpp

@@ -29,9 +29,9 @@
 #ifdef MAGNUM_BUILD_STATIC
 #include <Utility/Resource.h>
 static int magnumShadersResourceImport() {
-    RESOURCE_INITIALIZE(MagnumShaders_RCS)
+    CORRADE_RESOURCE_INITIALIZE(MagnumShaders_RCS)
     return 0;
-} AUTOMATIC_INITIALIZER(magnumShadersResourceImport)
+} CORRADE_AUTOMATIC_INITIALIZER(magnumShadersResourceImport)
 #endif
 
 #endif

src/Shaders/resources.conf

@@ -0,0 +1,49 @@
+group=MagnumShaders
+
+[file]
+filename=AbstractVector2D.vert
+
+[file]
+filename=AbstractVector3D.vert
+
+[file]
+filename=Flat2D.vert
+
+[file]
+filename=Flat3D.vert
+
+[file]
+filename=Flat.frag
+
+[file]
+filename=MeshVisualizer.vert
+
+[file]
+filename=MeshVisualizer.geom
+
+[file]
+filename=MeshVisualizer.frag
+
+[file]
+filename=Phong.vert
+
+[file]
+filename=Phong.frag
+
+[file]
+filename=Vector.frag
+
+[file]
+filename=DistanceFieldVector.frag
+
+[file]
+filename=VertexColor2D.vert
+
+[file]
+filename=VertexColor3D.vert
+
+[file]
+filename=VertexColor.frag
+
+[file]
+filename=compatibility.glsl

src/Text/AbstractFont.h

@@ -53,7 +53,7 @@ information. See TextRenderer for information about text rendering.
 Plugin implements functions open(), close(), createGlyphCache() and layout().
 */
 class MAGNUM_TEXT_EXPORT AbstractFont: public PluginManager::AbstractPlugin {
-    PLUGIN_INTERFACE("cz.mosra.magnum.Text.AbstractFont/0.1")
+    CORRADE_PLUGIN_INTERFACE("cz.mosra.magnum.Text.AbstractFont/0.1")
 
     public:
         /** @brief Default constructor */

src/TextureTools/CMakeLists.txt

@@ -22,9 +22,7 @@
 #   DEALINGS IN THE SOFTWARE.
 #
 
-corrade_add_resource(MagnumTextureTools_RCS MagnumTextureTools
+corrade_add_resource(MagnumTextureTools_RCS resources.conf)
-    DistanceFieldShader.vert DistanceFieldShader.frag
-    ../Shaders/compatibility.glsl ALIAS compatibility.glsl)
 
 set(MagnumTextureTools_SRCS
     Atlas.cpp

src/TextureTools/magnumTextureToolsResourceImport.hpp

@@ -29,9 +29,9 @@
 #ifdef MAGNUM_BUILD_STATIC
 #include <Utility/Resource.h>
 static int magnumTextureToolsResourceImport() {
-    RESOURCE_INITIALIZE(MagnumTextureTools_RCS)
+    CORRADE_RESOURCE_INITIALIZE(MagnumTextureTools_RCS)
     return 0;
-} AUTOMATIC_INITIALIZER(magnumTextureToolsResourceImport)
+} CORRADE_AUTOMATIC_INITIALIZER(magnumTextureToolsResourceImport)
 #endif
 
 #endif

src/TextureTools/resources.conf

@@ -0,0 +1,11 @@
+group=MagnumTextureTools
+
+[file]
+filename=DistanceFieldShader.vert
+
+[file]
+filename=DistanceFieldShader.frag
+
+[file]
+filename=../Shaders/compatibility.glsl
+alias=compatibility.glsl

src/Trade/AbstractImageConverter.h

@@ -49,7 +49,7 @@ convertToData() or convertToFile() functions based on what features are
 supported.
 */
 class MAGNUM_EXPORT AbstractImageConverter: public PluginManager::AbstractPlugin {
-    PLUGIN_INTERFACE("cz.mosra.magnum.Trade.AbstractImageConverter/0.1")
+    CORRADE_PLUGIN_INTERFACE("cz.mosra.magnum.Trade.AbstractImageConverter/0.1")
 
     public:
         /**

src/Trade/AbstractImporter.h

@@ -54,7 +54,7 @@ some data. This is obviously not the case for single-data formats like images,
 as the file contains all data user wants to import.
 */
 class MAGNUM_EXPORT AbstractImporter: public PluginManager::AbstractPlugin {
-    PLUGIN_INTERFACE("cz.mosra.magnum.Trade.AbstractImporter/0.2.1")
+    CORRADE_PLUGIN_INTERFACE("cz.mosra.magnum.Trade.AbstractImporter/0.2.1")
 
     public:
         /**