From d3c690b865afdb8a829414e3490ef4a5eae6c44e Mon Sep 17 00:00:00 2001 From: Hugo Amiard Date: Wed, 4 Jan 2023 21:17:30 +0100 Subject: [PATCH] Properly include Macros.h for CORRADE_AUTOMATIC_INITIALIZER(). Otherwise it fails to compile on a non-deprecated static build, as Macros.h is usually only included for the deprecation macros. --- src/MagnumPlugins/AnyAudioImporter/importStaticPlugin.cpp | 1 + src/MagnumPlugins/AnyImageConverter/importStaticPlugin.cpp | 1 + src/MagnumPlugins/AnyImageImporter/importStaticPlugin.cpp | 1 + src/MagnumPlugins/AnySceneConverter/importStaticPlugin.cpp | 1 + src/MagnumPlugins/AnySceneImporter/importStaticPlugin.cpp | 1 + src/MagnumPlugins/AnyShaderConverter/importStaticPlugin.cpp | 1 + src/MagnumPlugins/MagnumFont/importStaticPlugin.cpp | 1 + src/MagnumPlugins/MagnumFontConverter/importStaticPlugin.cpp | 1 + src/MagnumPlugins/ObjImporter/importStaticPlugin.cpp | 1 + src/MagnumPlugins/TgaImageConverter/importStaticPlugin.cpp | 1 + src/MagnumPlugins/TgaImporter/importStaticPlugin.cpp | 1 + src/MagnumPlugins/WavAudioImporter/importStaticPlugin.cpp | 1 + 12 files changed, 12 insertions(+) diff --git a/src/MagnumPlugins/AnyAudioImporter/importStaticPlugin.cpp b/src/MagnumPlugins/AnyAudioImporter/importStaticPlugin.cpp index 0cef58e6e..eacde0c29 100644 --- a/src/MagnumPlugins/AnyAudioImporter/importStaticPlugin.cpp +++ b/src/MagnumPlugins/AnyAudioImporter/importStaticPlugin.cpp @@ -27,6 +27,7 @@ #ifdef MAGNUM_ANYAUDIOIMPORTER_BUILD_STATIC #include +#include static int magnumAnyAudioImporterStaticImporter() { CORRADE_PLUGIN_IMPORT(AnyAudioImporter) diff --git a/src/MagnumPlugins/AnyImageConverter/importStaticPlugin.cpp b/src/MagnumPlugins/AnyImageConverter/importStaticPlugin.cpp index a6633b586..a0d910402 100644 --- a/src/MagnumPlugins/AnyImageConverter/importStaticPlugin.cpp +++ b/src/MagnumPlugins/AnyImageConverter/importStaticPlugin.cpp @@ -27,6 +27,7 @@ #ifdef MAGNUM_ANYIMAGECONVERTER_BUILD_STATIC #include +#include static int magnumAnyImageConverterStaticImporter() { CORRADE_PLUGIN_IMPORT(AnyImageConverter) diff --git a/src/MagnumPlugins/AnyImageImporter/importStaticPlugin.cpp b/src/MagnumPlugins/AnyImageImporter/importStaticPlugin.cpp index 41f3021b4..7bb9fdc16 100644 --- a/src/MagnumPlugins/AnyImageImporter/importStaticPlugin.cpp +++ b/src/MagnumPlugins/AnyImageImporter/importStaticPlugin.cpp @@ -27,6 +27,7 @@ #ifdef MAGNUM_ANYIMAGEIMPORTER_BUILD_STATIC #include +#include static int magnumAnyImageImporterStaticImporter() { CORRADE_PLUGIN_IMPORT(AnyImageImporter) diff --git a/src/MagnumPlugins/AnySceneConverter/importStaticPlugin.cpp b/src/MagnumPlugins/AnySceneConverter/importStaticPlugin.cpp index 86888a7c4..e8d5b563a 100644 --- a/src/MagnumPlugins/AnySceneConverter/importStaticPlugin.cpp +++ b/src/MagnumPlugins/AnySceneConverter/importStaticPlugin.cpp @@ -27,6 +27,7 @@ #ifdef MAGNUM_ANYSCENECONVERTER_BUILD_STATIC #include +#include static int magnumAnySceneConverterStaticImporter() { CORRADE_PLUGIN_IMPORT(AnySceneConverter) diff --git a/src/MagnumPlugins/AnySceneImporter/importStaticPlugin.cpp b/src/MagnumPlugins/AnySceneImporter/importStaticPlugin.cpp index 3527b92d7..bfab3aaaa 100644 --- a/src/MagnumPlugins/AnySceneImporter/importStaticPlugin.cpp +++ b/src/MagnumPlugins/AnySceneImporter/importStaticPlugin.cpp @@ -27,6 +27,7 @@ #ifdef MAGNUM_ANYSCENEIMPORTER_BUILD_STATIC #include +#include static int magnumAnySceneImporterStaticImporter() { CORRADE_PLUGIN_IMPORT(AnySceneImporter) diff --git a/src/MagnumPlugins/AnyShaderConverter/importStaticPlugin.cpp b/src/MagnumPlugins/AnyShaderConverter/importStaticPlugin.cpp index 63749bd16..72670425b 100644 --- a/src/MagnumPlugins/AnyShaderConverter/importStaticPlugin.cpp +++ b/src/MagnumPlugins/AnyShaderConverter/importStaticPlugin.cpp @@ -27,6 +27,7 @@ #ifdef MAGNUM_ANYSHADERCONVERTER_BUILD_STATIC #include +#include static int magnumAnyShaderConverterStaticImporter() { CORRADE_PLUGIN_IMPORT(AnyShaderConverter) diff --git a/src/MagnumPlugins/MagnumFont/importStaticPlugin.cpp b/src/MagnumPlugins/MagnumFont/importStaticPlugin.cpp index 7935752fb..c803782a9 100644 --- a/src/MagnumPlugins/MagnumFont/importStaticPlugin.cpp +++ b/src/MagnumPlugins/MagnumFont/importStaticPlugin.cpp @@ -27,6 +27,7 @@ #ifdef MAGNUM_MAGNUMFONT_BUILD_STATIC #include +#include static int magnumMagnumFontStaticImporter() { CORRADE_PLUGIN_IMPORT(MagnumFont) diff --git a/src/MagnumPlugins/MagnumFontConverter/importStaticPlugin.cpp b/src/MagnumPlugins/MagnumFontConverter/importStaticPlugin.cpp index 1ad1d16af..f11d1c0a4 100644 --- a/src/MagnumPlugins/MagnumFontConverter/importStaticPlugin.cpp +++ b/src/MagnumPlugins/MagnumFontConverter/importStaticPlugin.cpp @@ -27,6 +27,7 @@ #ifdef MAGNUM_MAGNUMFONTCONVERTER_BUILD_STATIC #include +#include static int magnumMagnumFontConverterStaticImporter() { CORRADE_PLUGIN_IMPORT(MagnumFontConverter) diff --git a/src/MagnumPlugins/ObjImporter/importStaticPlugin.cpp b/src/MagnumPlugins/ObjImporter/importStaticPlugin.cpp index 60f0177e9..737132e67 100644 --- a/src/MagnumPlugins/ObjImporter/importStaticPlugin.cpp +++ b/src/MagnumPlugins/ObjImporter/importStaticPlugin.cpp @@ -27,6 +27,7 @@ #ifdef MAGNUM_OBJIMPORTER_BUILD_STATIC #include +#include static int magnumObjImporterStaticImporter() { CORRADE_PLUGIN_IMPORT(ObjImporter) diff --git a/src/MagnumPlugins/TgaImageConverter/importStaticPlugin.cpp b/src/MagnumPlugins/TgaImageConverter/importStaticPlugin.cpp index f4b1917c7..d81c05efe 100644 --- a/src/MagnumPlugins/TgaImageConverter/importStaticPlugin.cpp +++ b/src/MagnumPlugins/TgaImageConverter/importStaticPlugin.cpp @@ -27,6 +27,7 @@ #ifdef MAGNUM_TGAIMAGECONVERTER_BUILD_STATIC #include +#include static int magnumTgaImageConverterStaticImporter() { CORRADE_PLUGIN_IMPORT(TgaImageConverter) diff --git a/src/MagnumPlugins/TgaImporter/importStaticPlugin.cpp b/src/MagnumPlugins/TgaImporter/importStaticPlugin.cpp index 62394a469..7d49a88d1 100644 --- a/src/MagnumPlugins/TgaImporter/importStaticPlugin.cpp +++ b/src/MagnumPlugins/TgaImporter/importStaticPlugin.cpp @@ -27,6 +27,7 @@ #ifdef MAGNUM_TGAIMPORTER_BUILD_STATIC #include +#include static int magnumTgaImporterStaticImporter() { CORRADE_PLUGIN_IMPORT(TgaImporter) diff --git a/src/MagnumPlugins/WavAudioImporter/importStaticPlugin.cpp b/src/MagnumPlugins/WavAudioImporter/importStaticPlugin.cpp index eb73493e2..65305bb5c 100644 --- a/src/MagnumPlugins/WavAudioImporter/importStaticPlugin.cpp +++ b/src/MagnumPlugins/WavAudioImporter/importStaticPlugin.cpp @@ -27,6 +27,7 @@ #ifdef MAGNUM_WAVAUDIOIMPORTER_BUILD_STATIC #include +#include static int magnumWavAudioImporterStaticImporter() { CORRADE_PLUGIN_IMPORT(WavAudioImporter)