diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-05-12 00:28:47 +0400 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-05-12 00:28:47 +0400 |
| commit | c785d7493ea72797afd369152e929f80f88795ae (patch) | |
| tree | 9758fc7dd8a1b902603c79ec34eaa5680b3ecbe4 /source/blender/freestyle/intern/rendering/pbuffer.h | |
| parent | fd9ad582983939741a4c4fa5f2707f29365d6c09 (diff) | |
| parent | 96486b356f7d035a7abc835adbef850c3f314264 (diff) | |
soc-2008-mxcurioni: merged changes to revision 14798, compilation works for rendering/ directry. Still needs to figure out how to compile on non-Unix machines.
Diffstat (limited to 'source/blender/freestyle/intern/rendering/pbuffer.h')
| -rwxr-xr-x | source/blender/freestyle/intern/rendering/pbuffer.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/rendering/pbuffer.h b/source/blender/freestyle/intern/rendering/pbuffer.h index 7f11f461b1c..35fd24484b6 100755 --- a/source/blender/freestyle/intern/rendering/pbuffer.h +++ b/source/blender/freestyle/intern/rendering/pbuffer.h @@ -1,13 +1,12 @@ #ifndef PBUFFERS_H #define PBUFFERS_H -#ifndef WIN32 -# ifdef __MACH__ +# ifdef __MACH__ # include <OpenGL/gl.h> -# else +# else # include <GL/gl.h> # include <GL/glx.h> -# endif +# endif //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // Interface of PBuffer @@ -74,4 +73,3 @@ private: }; #endif //PBUFFERS_H -#endif //WIN32 |