Browse Source

Adapted to Corrade changes.

pull/7/head
Vladimír Vondruš 14 years ago
parent
commit
6c5d96d645
  1. 4
      src/Context.cpp
  2. 2
      src/Platform/AbstractXApplication.h
  3. 2
      src/Platform/EglContextHandler.h
  4. 2
      src/Platform/GlutApplication.h
  5. 2
      src/Platform/GlxContextHandler.h
  6. 2
      src/Platform/NaClApplication.h
  7. 2
      src/Platform/Sdl2Application.h

4
src/Context.cpp

@ -18,7 +18,7 @@
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include <Utility/Debug.h> #include <Utility/Debug.h>
#include <Utility/utilities.h> #include <Utility/String.h>
#include "AbstractShaderProgram.h" #include "AbstractShaderProgram.h"
#include "AbstractTexture.h" #include "AbstractTexture.h"
@ -253,7 +253,7 @@ Context::Context() {
/* Don't crash when glGetString() returns nullptr */ /* Don't crash when glGetString() returns nullptr */
const char* e = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS)); const char* e = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));
if(e) { if(e) {
vector<string> extensions = Corrade::Utility::split(e, ' '); vector<string> extensions = Corrade::Utility::String::split(e, ' ');
for(const string& extension: extensions) { for(const string& extension: extensions) {
auto found = futureExtensions.find(extension); auto found = futureExtensions.find(extension);
if(found != futureExtensions.end()) { if(found != futureExtensions.end()) {

2
src/Platform/AbstractXApplication.h

@ -32,8 +32,6 @@
#include "Math/Vector2.h" #include "Math/Vector2.h"
#include "AbstractContextHandler.h" #include "AbstractContextHandler.h"
#include "magnumCompatibility.h"
namespace Magnum { namespace Magnum {
class Context; class Context;

2
src/Platform/EglContextHandler.h

@ -31,7 +31,7 @@
#include "AbstractContextHandler.h" #include "AbstractContextHandler.h"
#include "magnumCompatibility.h" #include "corradeCompatibility.h"
namespace Magnum { namespace Platform { namespace Magnum { namespace Platform {

2
src/Platform/GlutApplication.h

@ -26,8 +26,6 @@
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "magnumCompatibility.h"
namespace Magnum { namespace Magnum {
class Context; class Context;

2
src/Platform/GlxContextHandler.h

@ -27,7 +27,7 @@
#include "AbstractContextHandler.h" #include "AbstractContextHandler.h"
#include "magnumCompatibility.h" #include "corradeCompatibility.h"
namespace Magnum { namespace Platform { namespace Magnum { namespace Platform {

2
src/Platform/NaClApplication.h

@ -31,7 +31,7 @@
#include "Math/Vector2.h" #include "Math/Vector2.h"
#include "Magnum.h" #include "Magnum.h"
#include "magnumCompatibility.h" #include "corradeCompatibility.h"
namespace pp { namespace pp {
class Graphics3D; class Graphics3D;

2
src/Platform/Sdl2Application.h

@ -26,8 +26,6 @@
#include <SDL2/SDL_scancode.h> #include <SDL2/SDL_scancode.h>
#include <Corrade/Containers/EnumSet.h> #include <Corrade/Containers/EnumSet.h>
#include "magnumCompatibility.h"
namespace Magnum { namespace Magnum {
class Context; class Context;

Loading…
Cancel
Save