diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-06-12 05:26:22 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-06-12 05:26:22 +0400 |
| commit | a8dee3a614692b7e4f4a897cc32f85a19c965dff (patch) | |
| tree | 6611096b3938d1ac6871290a98e6b7efa7a5f63a /intern/opencolorio | |
| parent | 6da8fa60f58b458bca12e8655cea11c148e4fc2f (diff) | |
GHOST Refactor for EGL Contexts
Documentation to appear here:
http://wiki.blender.org/index.php/User:Jwilkins/VFX/GHOST_Refactor_for_EGL
Missing from this commit is support for systems other than Windows.
This also only builds with CMake.
Diffstat (limited to 'intern/opencolorio')
| -rw-r--r-- | intern/opencolorio/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | intern/opencolorio/ocio_impl.cc | 7 | ||||
| -rw-r--r-- | intern/opencolorio/ocio_impl_glsl.cc | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/intern/opencolorio/CMakeLists.txt b/intern/opencolorio/CMakeLists.txt index 3a139dc64cf..61a8d995f40 100644 --- a/intern/opencolorio/CMakeLists.txt +++ b/intern/opencolorio/CMakeLists.txt @@ -25,6 +25,7 @@ set(INC . + ../glew-mx ../guardedalloc ../../source/blender/blenlib ) @@ -44,9 +45,10 @@ set(SRC if(WITH_OPENCOLORIO) add_definitions( -DWITH_OCIO - -DGLEW_STATIC ) + add_definitions(${GL_DEFINITIONS}) + list(APPEND INC_SYS ${OPENCOLORIO_INCLUDE_DIRS} ${GLEW_INCLUDE_PATH} diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc index 663ca2d1c75..5015f3a5c7d 100644 --- a/intern/opencolorio/ocio_impl.cc +++ b/intern/opencolorio/ocio_impl.cc @@ -29,13 +29,6 @@ #include <sstream> #include <string.h> -#ifdef __APPLE__ -#include <OpenGL/gl.h> -#include <OpenGL/glu.h> -#else -#include <GL/glew.h> -#endif - #include <OpenColorIO/OpenColorIO.h> using namespace OCIO_NAMESPACE; diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc index 677be0bf9ed..62290a325b4 100644 --- a/intern/opencolorio/ocio_impl_glsl.cc +++ b/intern/opencolorio/ocio_impl_glsl.cc @@ -37,7 +37,7 @@ #include <sstream> #include <string.h> -#include <GL/glew.h> +#include "glew-mx.h" #include <OpenColorIO/OpenColorIO.h> |