ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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.
pull/613/head
Hugo Amiard 3 years ago committed by Vladimír Vondruš
parent
b405839de5
commit
d3c690b865
12 changed files with 12 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/MagnumPlugins/AnyAudioImporter/importStaticPlugin.cpp
  2. 1
      src/MagnumPlugins/AnyImageConverter/importStaticPlugin.cpp
  3. 1
      src/MagnumPlugins/AnyImageImporter/importStaticPlugin.cpp
  4. 1
      src/MagnumPlugins/AnySceneConverter/importStaticPlugin.cpp
  5. 1
      src/MagnumPlugins/AnySceneImporter/importStaticPlugin.cpp
  6. 1
      src/MagnumPlugins/AnyShaderConverter/importStaticPlugin.cpp
  7. 1
      src/MagnumPlugins/MagnumFont/importStaticPlugin.cpp
  8. 1
      src/MagnumPlugins/MagnumFontConverter/importStaticPlugin.cpp
  9. 1
      src/MagnumPlugins/ObjImporter/importStaticPlugin.cpp
  10. 1
      src/MagnumPlugins/TgaImageConverter/importStaticPlugin.cpp
  11. 1
      src/MagnumPlugins/TgaImporter/importStaticPlugin.cpp
  12. 1
      src/MagnumPlugins/WavAudioImporter/importStaticPlugin.cpp

1
src/MagnumPlugins/AnyAudioImporter/importStaticPlugin.cpp
Unescape View File

@ -27,6 +27,7 @@
#ifdef MAGNUM_ANYAUDIOIMPORTER_BUILD_STATIC #ifdef MAGNUM_ANYAUDIOIMPORTER_BUILD_STATIC
#include <Corrade/PluginManager/AbstractManager.h> #include <Corrade/PluginManager/AbstractManager.h>
#include <Corrade/Utility/Macros.h>
static int magnumAnyAudioImporterStaticImporter() { static int magnumAnyAudioImporterStaticImporter() {
CORRADE_PLUGIN_IMPORT(AnyAudioImporter) CORRADE_PLUGIN_IMPORT(AnyAudioImporter)

1
src/MagnumPlugins/AnyImageConverter/importStaticPlugin.cpp
Unescape View File

@ -27,6 +27,7 @@
#ifdef MAGNUM_ANYIMAGECONVERTER_BUILD_STATIC #ifdef MAGNUM_ANYIMAGECONVERTER_BUILD_STATIC
#include <Corrade/PluginManager/AbstractManager.h> #include <Corrade/PluginManager/AbstractManager.h>
#include <Corrade/Utility/Macros.h>
static int magnumAnyImageConverterStaticImporter() { static int magnumAnyImageConverterStaticImporter() {
CORRADE_PLUGIN_IMPORT(AnyImageConverter) CORRADE_PLUGIN_IMPORT(AnyImageConverter)

1
src/MagnumPlugins/AnyImageImporter/importStaticPlugin.cpp
Unescape View File

@ -27,6 +27,7 @@
#ifdef MAGNUM_ANYIMAGEIMPORTER_BUILD_STATIC #ifdef MAGNUM_ANYIMAGEIMPORTER_BUILD_STATIC
#include <Corrade/PluginManager/AbstractManager.h> #include <Corrade/PluginManager/AbstractManager.h>
#include <Corrade/Utility/Macros.h>
static int magnumAnyImageImporterStaticImporter() { static int magnumAnyImageImporterStaticImporter() {
CORRADE_PLUGIN_IMPORT(AnyImageImporter) CORRADE_PLUGIN_IMPORT(AnyImageImporter)

1
src/MagnumPlugins/AnySceneConverter/importStaticPlugin.cpp
Unescape View File

@ -27,6 +27,7 @@
#ifdef MAGNUM_ANYSCENECONVERTER_BUILD_STATIC #ifdef MAGNUM_ANYSCENECONVERTER_BUILD_STATIC
#include <Corrade/PluginManager/AbstractManager.h> #include <Corrade/PluginManager/AbstractManager.h>
#include <Corrade/Utility/Macros.h>
static int magnumAnySceneConverterStaticImporter() { static int magnumAnySceneConverterStaticImporter() {
CORRADE_PLUGIN_IMPORT(AnySceneConverter) CORRADE_PLUGIN_IMPORT(AnySceneConverter)

1
src/MagnumPlugins/AnySceneImporter/importStaticPlugin.cpp
Unescape View File

@ -27,6 +27,7 @@
#ifdef MAGNUM_ANYSCENEIMPORTER_BUILD_STATIC #ifdef MAGNUM_ANYSCENEIMPORTER_BUILD_STATIC
#include <Corrade/PluginManager/AbstractManager.h> #include <Corrade/PluginManager/AbstractManager.h>
#include <Corrade/Utility/Macros.h>
static int magnumAnySceneImporterStaticImporter() { static int magnumAnySceneImporterStaticImporter() {
CORRADE_PLUGIN_IMPORT(AnySceneImporter) CORRADE_PLUGIN_IMPORT(AnySceneImporter)

1
src/MagnumPlugins/AnyShaderConverter/importStaticPlugin.cpp
Unescape View File

@ -27,6 +27,7 @@
#ifdef MAGNUM_ANYSHADERCONVERTER_BUILD_STATIC #ifdef MAGNUM_ANYSHADERCONVERTER_BUILD_STATIC
#include <Corrade/PluginManager/AbstractManager.h> #include <Corrade/PluginManager/AbstractManager.h>
#include <Corrade/Utility/Macros.h>
static int magnumAnyShaderConverterStaticImporter() { static int magnumAnyShaderConverterStaticImporter() {
CORRADE_PLUGIN_IMPORT(AnyShaderConverter) CORRADE_PLUGIN_IMPORT(AnyShaderConverter)

1
src/MagnumPlugins/MagnumFont/importStaticPlugin.cpp
Unescape View File

@ -27,6 +27,7 @@
#ifdef MAGNUM_MAGNUMFONT_BUILD_STATIC #ifdef MAGNUM_MAGNUMFONT_BUILD_STATIC
#include <Corrade/PluginManager/AbstractManager.h> #include <Corrade/PluginManager/AbstractManager.h>
#include <Corrade/Utility/Macros.h>
static int magnumMagnumFontStaticImporter() { static int magnumMagnumFontStaticImporter() {
CORRADE_PLUGIN_IMPORT(MagnumFont) CORRADE_PLUGIN_IMPORT(MagnumFont)

1
src/MagnumPlugins/MagnumFontConverter/importStaticPlugin.cpp
Unescape View File

@ -27,6 +27,7 @@
#ifdef MAGNUM_MAGNUMFONTCONVERTER_BUILD_STATIC #ifdef MAGNUM_MAGNUMFONTCONVERTER_BUILD_STATIC
#include <Corrade/PluginManager/AbstractManager.h> #include <Corrade/PluginManager/AbstractManager.h>
#include <Corrade/Utility/Macros.h>
static int magnumMagnumFontConverterStaticImporter() { static int magnumMagnumFontConverterStaticImporter() {
CORRADE_PLUGIN_IMPORT(MagnumFontConverter) CORRADE_PLUGIN_IMPORT(MagnumFontConverter)

1
src/MagnumPlugins/ObjImporter/importStaticPlugin.cpp
Unescape View File

@ -27,6 +27,7 @@
#ifdef MAGNUM_OBJIMPORTER_BUILD_STATIC #ifdef MAGNUM_OBJIMPORTER_BUILD_STATIC
#include <Corrade/PluginManager/AbstractManager.h> #include <Corrade/PluginManager/AbstractManager.h>
#include <Corrade/Utility/Macros.h>
static int magnumObjImporterStaticImporter() { static int magnumObjImporterStaticImporter() {
CORRADE_PLUGIN_IMPORT(ObjImporter) CORRADE_PLUGIN_IMPORT(ObjImporter)

1
src/MagnumPlugins/TgaImageConverter/importStaticPlugin.cpp
Unescape View File

@ -27,6 +27,7 @@
#ifdef MAGNUM_TGAIMAGECONVERTER_BUILD_STATIC #ifdef MAGNUM_TGAIMAGECONVERTER_BUILD_STATIC
#include <Corrade/PluginManager/AbstractManager.h> #include <Corrade/PluginManager/AbstractManager.h>
#include <Corrade/Utility/Macros.h>
static int magnumTgaImageConverterStaticImporter() { static int magnumTgaImageConverterStaticImporter() {
CORRADE_PLUGIN_IMPORT(TgaImageConverter) CORRADE_PLUGIN_IMPORT(TgaImageConverter)

1
src/MagnumPlugins/TgaImporter/importStaticPlugin.cpp
Unescape View File

@ -27,6 +27,7 @@
#ifdef MAGNUM_TGAIMPORTER_BUILD_STATIC #ifdef MAGNUM_TGAIMPORTER_BUILD_STATIC
#include <Corrade/PluginManager/AbstractManager.h> #include <Corrade/PluginManager/AbstractManager.h>
#include <Corrade/Utility/Macros.h>
static int magnumTgaImporterStaticImporter() { static int magnumTgaImporterStaticImporter() {
CORRADE_PLUGIN_IMPORT(TgaImporter) CORRADE_PLUGIN_IMPORT(TgaImporter)

1
src/MagnumPlugins/WavAudioImporter/importStaticPlugin.cpp
Unescape View File

@ -27,6 +27,7 @@
#ifdef MAGNUM_WAVAUDIOIMPORTER_BUILD_STATIC #ifdef MAGNUM_WAVAUDIOIMPORTER_BUILD_STATIC
#include <Corrade/PluginManager/AbstractManager.h> #include <Corrade/PluginManager/AbstractManager.h>
#include <Corrade/Utility/Macros.h>
static int magnumWavAudioImporterStaticImporter() { static int magnumWavAudioImporterStaticImporter() {
CORRADE_PLUGIN_IMPORT(WavAudioImporter) CORRADE_PLUGIN_IMPORT(WavAudioImporter)

Write Preview
Loading…
Cancel
Save