diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-09-29 23:59:08 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-09-29 23:59:08 +0000 |
| commit | e8f94fe7ca5e7e7838eaa84f1792b4b42b4bada3 (patch) | |
| tree | e8dc775e12f6b4eb0a6d56448f05286c774bbb8a /src/resources/image.h | |
| parent | 0e8c09433f3a193b5a94a1ad572d8237113cdfbf (diff) | |
| download | mana-client-e8f94fe7ca5e7e7838eaa84f1792b4b42b4bada3.tar.gz mana-client-e8f94fe7ca5e7e7838eaa84f1792b4b42b4bada3.tar.bz2 mana-client-e8f94fe7ca5e7e7838eaa84f1792b4b42b4bada3.tar.xz mana-client-e8f94fe7ca5e7e7838eaa84f1792b4b42b4bada3.zip | |
Merged trunk changes from revision 2618 to 2716 into the 0.1.0 branch.
Diffstat (limited to 'src/resources/image.h')
| -rw-r--r-- | src/resources/image.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/resources/image.h b/src/resources/image.h index 78751394..a1ab7f48 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -28,6 +28,13 @@ #include <SDL.h> #ifdef USE_OPENGL + +/* The definition of OpenGL extensions by SDL is giving problems with recent + * gl.h headers, since they also include these definitions. As we're not using + * extensions anyway it's safe to just disable the SDL version. + */ +#define NO_SDL_GLEXT + #include <SDL_opengl.h> #endif |