From d969a9a1620ffa785563a1a86335833c69ae8720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 31 May 2013 16:12:30 +0200 Subject: [PATCH] Adapted to Corrade changes. --- src/Shaders/CMakeLists.txt | 9 +--- src/Shaders/magnumShadersResourceImport.hpp | 4 +- src/Shaders/resources.conf | 49 +++++++++++++++++++ src/Text/AbstractFont.h | 2 +- src/TextureTools/CMakeLists.txt | 4 +- .../magnumTextureToolsResourceImport.hpp | 4 +- src/TextureTools/resources.conf | 11 +++++ src/Trade/AbstractImageConverter.h | 2 +- src/Trade/AbstractImporter.h | 2 +- 9 files changed, 69 insertions(+), 18 deletions(-) create mode 100644 src/Shaders/resources.conf create mode 100644 src/TextureTools/resources.conf diff --git a/src/Shaders/CMakeLists.txt b/src/Shaders/CMakeLists.txt index f576e5e86..79de6f97c 100644 --- a/src/Shaders/CMakeLists.txt +++ b/src/Shaders/CMakeLists.txt @@ -22,14 +22,7 @@ # DEALINGS IN THE SOFTWARE. # -corrade_add_resource(MagnumShaders_RCS MagnumShaders - 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) +corrade_add_resource(MagnumShaders_RCS resources.conf) set(MagnumShaders_SRCS DistanceFieldVector.cpp diff --git a/src/Shaders/magnumShadersResourceImport.hpp b/src/Shaders/magnumShadersResourceImport.hpp index 624b956b1..818f86e9f 100644 --- a/src/Shaders/magnumShadersResourceImport.hpp +++ b/src/Shaders/magnumShadersResourceImport.hpp @@ -29,9 +29,9 @@ #ifdef MAGNUM_BUILD_STATIC #include static int magnumShadersResourceImport() { - RESOURCE_INITIALIZE(MagnumShaders_RCS) + CORRADE_RESOURCE_INITIALIZE(MagnumShaders_RCS) return 0; -} AUTOMATIC_INITIALIZER(magnumShadersResourceImport) +} CORRADE_AUTOMATIC_INITIALIZER(magnumShadersResourceImport) #endif #endif diff --git a/src/Shaders/resources.conf b/src/Shaders/resources.conf new file mode 100644 index 000000000..3f23a2663 --- /dev/null +++ b/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 diff --git a/src/Text/AbstractFont.h b/src/Text/AbstractFont.h index a8d3c9af4..765defb49 100644 --- a/src/Text/AbstractFont.h +++ b/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 */ diff --git a/src/TextureTools/CMakeLists.txt b/src/TextureTools/CMakeLists.txt index fdede4e15..b2237b57b 100644 --- a/src/TextureTools/CMakeLists.txt +++ b/src/TextureTools/CMakeLists.txt @@ -22,9 +22,7 @@ # DEALINGS IN THE SOFTWARE. # -corrade_add_resource(MagnumTextureTools_RCS MagnumTextureTools - DistanceFieldShader.vert DistanceFieldShader.frag - ../Shaders/compatibility.glsl ALIAS compatibility.glsl) +corrade_add_resource(MagnumTextureTools_RCS resources.conf) set(MagnumTextureTools_SRCS Atlas.cpp diff --git a/src/TextureTools/magnumTextureToolsResourceImport.hpp b/src/TextureTools/magnumTextureToolsResourceImport.hpp index d540e7536..fa62dded2 100644 --- a/src/TextureTools/magnumTextureToolsResourceImport.hpp +++ b/src/TextureTools/magnumTextureToolsResourceImport.hpp @@ -29,9 +29,9 @@ #ifdef MAGNUM_BUILD_STATIC #include static int magnumTextureToolsResourceImport() { - RESOURCE_INITIALIZE(MagnumTextureTools_RCS) + CORRADE_RESOURCE_INITIALIZE(MagnumTextureTools_RCS) return 0; -} AUTOMATIC_INITIALIZER(magnumTextureToolsResourceImport) +} CORRADE_AUTOMATIC_INITIALIZER(magnumTextureToolsResourceImport) #endif #endif diff --git a/src/TextureTools/resources.conf b/src/TextureTools/resources.conf new file mode 100644 index 000000000..71a74be59 --- /dev/null +++ b/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 diff --git a/src/Trade/AbstractImageConverter.h b/src/Trade/AbstractImageConverter.h index 643abd4b8..b2826b96c 100644 --- a/src/Trade/AbstractImageConverter.h +++ b/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: /** diff --git a/src/Trade/AbstractImporter.h b/src/Trade/AbstractImporter.h index eb4a7bb9a..85dde6362 100644 --- a/src/Trade/AbstractImporter.h +++ b/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: /**