Browse Source

Common format for preprocessor #error messages.

Similarly to other compiler errors: first letter lowercase, no period
after.
pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
5175805762
  1. 2
      doc/generated/shaders.cpp
  2. 2
      src/Magnum/BufferImage.h
  3. 2
      src/Magnum/BufferTexture.h
  4. 2
      src/Magnum/CubeMapTextureArray.h
  5. 2
      src/Magnum/Implementation/TransformFeedbackState.h
  6. 2
      src/Magnum/MultisampleTexture.h
  7. 2
      src/Magnum/Platform/AndroidApplication.h
  8. 4
      src/Magnum/Platform/Implementation/EglContextHandler.cpp
  9. 2
      src/Magnum/Platform/Implementation/GlxContextHandler.cpp
  10. 4
      src/Magnum/Platform/Implementation/OpenGLFunctionLoader.cpp
  11. 2
      src/Magnum/Platform/Implementation/OpenGLFunctionLoader.h
  12. 2
      src/Magnum/Platform/NaClApplication.h
  13. 2
      src/Magnum/Platform/Sdl2Application.cpp
  14. 2
      src/Magnum/Platform/WindowlessGlxApplication.cpp
  15. 4
      src/Magnum/Platform/magnum-info.cpp
  16. 2
      src/Magnum/PrimitiveQuery.h
  17. 2
      src/Magnum/RectangleTexture.h
  18. 2
      src/Magnum/Test/AbstractOpenGLTester.h
  19. 2
      src/Magnum/Text/fontconverter.cpp
  20. 2
      src/Magnum/TextureArray.h
  21. 2
      src/Magnum/TextureTools/distancefieldconverter.cpp
  22. 2
      src/Magnum/TransformFeedback.h

2
doc/generated/shaders.cpp

@ -33,7 +33,7 @@
#elif defined(CORRADE_TARGET_WINDOWS) #elif defined(CORRADE_TARGET_WINDOWS)
#include <Magnum/Platform/WindowlessWglApplication.h> #include <Magnum/Platform/WindowlessWglApplication.h>
#else #else
#error No windowless application available on this platform #error no windowless application available on this platform
#endif #endif
#include <Magnum/Buffer.h> #include <Magnum/Buffer.h>

2
src/Magnum/BufferImage.h

@ -141,7 +141,7 @@ template<UnsignedInt dimensions> inline BufferImage<dimensions>& BufferImage<dim
return *this; return *this;
} }
#else #else
#error this header is available only on desktop OpenGL and OpenGL ES 3.0 build #error this header is not available in OpenGL ES 2.0 build
#endif #endif
} }

2
src/Magnum/BufferTexture.h

@ -299,7 +299,7 @@ class MAGNUM_EXPORT BufferTexture: public AbstractTexture {
} }
#else #else
#error this header is available only on desktop OpenGL build #error this header is not available in OpenGL ES build
#endif #endif
#endif #endif

2
src/Magnum/CubeMapTextureArray.h

@ -503,7 +503,7 @@ class MAGNUM_EXPORT CubeMapTextureArray: public AbstractTexture {
} }
#else #else
#error this header is available only on desktop OpenGL build #error this header is not available in OpenGL ES build
#endif #endif
#endif #endif

2
src/Magnum/Implementation/TransformFeedbackState.h

@ -28,7 +28,7 @@
#include "Magnum/Context.h" #include "Magnum/Context.h"
#ifdef MAGNUM_TARGET_GLES2 #ifdef MAGNUM_TARGET_GLES2
#error This header is not available in OpenGL ES 2.0 build. #error this header is not available in OpenGL ES 2.0 build
#endif #endif
namespace Magnum { namespace Implementation { namespace Magnum { namespace Implementation {

2
src/Magnum/MultisampleTexture.h

@ -226,7 +226,7 @@ typedef MultisampleTexture<3> MultisampleTexture2DArray;
} }
#else #else
#error this header is available only on desktop OpenGL build #error this header is not available in OpenGL ES 2.0 build
#endif #endif
#endif #endif

2
src/Magnum/Platform/AndroidApplication.h

@ -38,7 +38,7 @@
#include "Magnum/Platform/Platform.h" #include "Magnum/Platform/Platform.h"
#ifndef CORRADE_TARGET_ANDROID #ifndef CORRADE_TARGET_ANDROID
#error This file is available only on Android #error this file is available only on Android build
#endif #endif
/* Undef Xlib nonsense which might get pulled in by EGL */ /* Undef Xlib nonsense which might get pulled in by EGL */

4
src/Magnum/Platform/Implementation/EglContextHandler.cpp

@ -73,7 +73,7 @@ VisualId EglContextHandler::getVisualId(EGLNativeDisplayType nativeDisplay) {
#elif defined(MAGNUM_TARGET_GLES2) #elif defined(MAGNUM_TARGET_GLES2)
EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
#else #else
#error Unsupported OpenGL edition #error unsupported OpenGL edition
#endif #endif
EGL_NONE EGL_NONE
}; };
@ -137,7 +137,7 @@ void EglContextHandler::createContext(const AbstractXApplication::Configuration&
#elif defined(MAGNUM_TARGET_GLES2) #elif defined(MAGNUM_TARGET_GLES2)
attributes[1] = 2; attributes[1] = 2;
#else #else
#error Unsupported OpenGL ES version #error unsupported OpenGL ES version
#endif #endif
} }
#endif #endif

2
src/Magnum/Platform/Implementation/GlxContextHandler.cpp

@ -114,7 +114,7 @@ void GlxContextHandler::createContext(const AbstractXApplication::Configuration&
#elif defined(MAGNUM_TARGET_GLES2) #elif defined(MAGNUM_TARGET_GLES2)
attributes[1] = 2; attributes[1] = 2;
#else #else
#error Unsupported OpenGL ES version #error unsupported OpenGL ES version
#endif #endif
attributes[2] = GLX_CONTEXT_MINOR_VERSION_ARB; attributes[2] = GLX_CONTEXT_MINOR_VERSION_ARB;
attributes[3] = 0; attributes[3] = 0;

4
src/Magnum/Platform/Implementation/OpenGLFunctionLoader.cpp

@ -48,7 +48,7 @@
/* Otherwise unsupported */ /* Otherwise unsupported */
#else #else
#error Unsupported platform #error unsupported platform
#endif #endif
namespace Magnum { namespace Platform { namespace Implementation { namespace Magnum { namespace Platform { namespace Implementation {
@ -108,7 +108,7 @@ auto OpenGLFunctionLoader::load(const char* const name) -> FunctionPointer {
/* Otherwise unsupported */ /* Otherwise unsupported */
#else #else
#error Unsupported platform #error unsupported platform
#endif #endif
}}} }}}

2
src/Magnum/Platform/Implementation/OpenGLFunctionLoader.h

@ -64,7 +64,7 @@ class OpenGLFunctionLoader {
/* Otherwise unsupported */ /* Otherwise unsupported */
#else #else
#error Unsupported platform #error unsupported platform
#endif #endif
}; };

2
src/Magnum/Platform/NaClApplication.h

@ -53,7 +53,7 @@ namespace pp {
} }
#ifndef CORRADE_TARGET_NACL #ifndef CORRADE_TARGET_NACL
#error This header is available only on Google Chrome Native Client #error this header is available only on Google Chrome Native Client build
#endif #endif
namespace Magnum { namespace Platform { namespace Magnum { namespace Platform {

2
src/Magnum/Platform/Sdl2Application.cpp

@ -148,7 +148,7 @@ bool Sdl2Application::tryCreateContext(const Configuration& configuration) {
#elif defined(MAGNUM_TARGET_GLES2) #elif defined(MAGNUM_TARGET_GLES2)
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
#else #else
#error Unsupported OpenGL ES version #error unsupported OpenGL ES version
#endif #endif
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES); SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);

2
src/Magnum/Platform/WindowlessGlxApplication.cpp

@ -79,7 +79,7 @@ bool WindowlessGlxApplication::tryCreateContext(const Configuration&) {
#elif defined(MAGNUM_TARGET_GLES2) #elif defined(MAGNUM_TARGET_GLES2)
GLX_CONTEXT_MAJOR_VERSION_ARB, 2, GLX_CONTEXT_MAJOR_VERSION_ARB, 2,
#else #else
#error Unsupported OpenGL ES version #error unsupported OpenGL ES version
#endif #endif
GLX_CONTEXT_MINOR_VERSION_ARB, 0, GLX_CONTEXT_MINOR_VERSION_ARB, 0,
GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_ES2_PROFILE_BIT_EXT, GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_ES2_PROFILE_BIT_EXT,

4
src/Magnum/Platform/magnum-info.cpp

@ -65,7 +65,7 @@
#elif defined(CORRADE_TARGET_WINDOWS) #elif defined(CORRADE_TARGET_WINDOWS)
#include "Magnum/Platform/WindowlessWglApplication.h" #include "Magnum/Platform/WindowlessWglApplication.h"
#else #else
#error No windowless application available on this platform #error no windowless application available on this platform
#endif #endif
namespace Magnum { namespace Magnum {
@ -170,7 +170,7 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat
#elif defined(CORRADE_TARGET_WINDOWS) #elif defined(CORRADE_TARGET_WINDOWS)
Debug() << "Used application: Platform::WindowlessWglApplication"; Debug() << "Used application: Platform::WindowlessWglApplication";
#else #else
#error No windowless application available on this platform #error no windowless application available on this platform
#endif #endif
Debug() << "Compilation flags:"; Debug() << "Compilation flags:";
#ifdef CORRADE_GCC47_COMPATIBILITY #ifdef CORRADE_GCC47_COMPATIBILITY

2
src/Magnum/PrimitiveQuery.h

@ -128,6 +128,8 @@ class PrimitiveQuery: public AbstractQuery {
}; };
} }
#else
#error this header is not available in OpenGL ES 2.0 build
#endif #endif
#endif #endif

2
src/Magnum/RectangleTexture.h

@ -414,7 +414,7 @@ class MAGNUM_EXPORT RectangleTexture: public AbstractTexture {
} }
#else #else
#error this header is available only on desktop OpenGL build #error this header is not available in OpenGL ES build
#endif #endif
#endif #endif

2
src/Magnum/Test/AbstractOpenGLTester.h

@ -35,7 +35,7 @@
#if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_DESKTOP_GLES) #if !defined(MAGNUM_TARGET_GLES) || defined(MAGNUM_TARGET_DESKTOP_GLES)
#include "Magnum/Platform/WindowlessGlxApplication.h" #include "Magnum/Platform/WindowlessGlxApplication.h"
#else #else
#error Cannot run OpenGL tests on this platform #error cannot run OpenGL tests on this platform
#endif #endif
namespace Magnum { namespace Test { namespace Magnum { namespace Test {

2
src/Magnum/Text/fontconverter.cpp

@ -39,7 +39,7 @@
#elif defined(CORRADE_TARGET_WINDOWS) #elif defined(CORRADE_TARGET_WINDOWS)
#include "Magnum/Platform/WindowlessWglApplication.h" #include "Magnum/Platform/WindowlessWglApplication.h"
#else #else
#error No windowless application available on this platform #error no windowless application available on this platform
#endif #endif
#include "fontconverterConfigure.h" #include "fontconverterConfigure.h"

2
src/Magnum/TextureArray.h

@ -562,7 +562,7 @@ typedef TextureArray<2> Texture2DArray;
} }
#else #else
#error this header is not available on OpenGL ES 2.0 build #error this header is not available in OpenGL ES 2.0 build
#endif #endif
#endif #endif

2
src/Magnum/TextureTools/distancefieldconverter.cpp

@ -45,7 +45,7 @@
#elif defined(CORRADE_TARGET_WINDOWS) #elif defined(CORRADE_TARGET_WINDOWS)
#include "Magnum/Platform/WindowlessWglApplication.h" #include "Magnum/Platform/WindowlessWglApplication.h"
#else #else
#error No windowless application available on this platform #error no windowless application available on this platform
#endif #endif
#include "distancefieldconverterConfigure.h" #include "distancefieldconverterConfigure.h"

2
src/Magnum/TransformFeedback.h

@ -383,7 +383,7 @@ inline TransformFeedback& TransformFeedback::operator=(TransformFeedback&& other
} }
#else #else
#error This header is not available in OpenGL ES 2.0 build. #error this header is not available in OpenGL ES 2.0 build
#endif #endif
#endif #endif

Loading…
Cancel
Save