From 8d084e8c8f48dd2f07d4a3fbd4a941a7bcc0dcfb Mon Sep 17 00:00:00 2001
From: Jason Wilkins <Jason.A.Wilkins@gmail.com>
Date: Tue, 7 Oct 2014 15:46:19 -0500
Subject: Ghost Context Refactor https://developer.blender.org/D643 Separates
 graphics context creation from window code in Ghost so that they can vary
 separately.

---
 intern/opencolorio/CMakeLists.txt    | 4 +++-
 intern/opencolorio/SConscript        | 5 +++--
 intern/opencolorio/ocio_impl.cc      | 7 -------
 intern/opencolorio/ocio_impl_glsl.cc | 2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'intern/opencolorio')

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/SConscript b/intern/opencolorio/SConscript
index 70aa9000719..c2fb95a4d95 100644
--- a/intern/opencolorio/SConscript
+++ b/intern/opencolorio/SConscript
@@ -30,12 +30,13 @@ Import('env')
 sources = env.Glob('*.cc')
 
 incs = '. ../guardedalloc ../../source/blender/blenlib'
-defs = [ 'GLEW_STATIC' ]
+defs = env['BF_GL_DEFINITIONS']
 
 if env['WITH_BF_OCIO']:
     defs.append('WITH_OCIO')
     incs += ' ' + env['BF_OCIO_INC']
-    incs += ' ' + '#/extern/glew/include'
+    incs += ' ' + env['BF_GLEW_INC']
+    incs += ' ' + '#/intern/glew-mx'
 
     if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
         incs += ' ' + env['BF_BOOST_INC']
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>
 
-- 
cgit v1.2.3