Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-03-29 20:17:22 +0400
committerThomas Dinges <blender@dingto.org>2013-03-29 20:17:22 +0400
commit96c2647676bbeaf8985ff5532caaf6eaa274c2de (patch)
tree42405f2e8ecfe0431eaa9cd2f1c171df94ed1c1b /intern/opencolorio
parent2dff7c01ada2a645d39c2acdc83a10e4a295b35b (diff)
Compile fix for recent OCIO commit, missing GLEW include.
Diffstat (limited to 'intern/opencolorio')
-rw-r--r--intern/opencolorio/CMakeLists.txt1
-rw-r--r--intern/opencolorio/SConscript1
2 files changed, 2 insertions, 0 deletions
diff --git a/intern/opencolorio/CMakeLists.txt b/intern/opencolorio/CMakeLists.txt
index 91bf6550f27..5680ce79762 100644
--- a/intern/opencolorio/CMakeLists.txt
+++ b/intern/opencolorio/CMakeLists.txt
@@ -48,6 +48,7 @@ if(WITH_OPENCOLORIO)
list(APPEND INC_SYS
${OPENCOLORIO_INCLUDE_DIRS}
+ ${GLEW_INCLUDE_PATH}
)
list(APPEND SRC
diff --git a/intern/opencolorio/SConscript b/intern/opencolorio/SConscript
index e4a0d3ebb7c..73a8fd7a2e0 100644
--- a/intern/opencolorio/SConscript
+++ b/intern/opencolorio/SConscript
@@ -35,6 +35,7 @@ defs = []
if env['WITH_BF_OCIO']:
defs.append('WITH_OCIO')
incs += ' ' + env['BF_OCIO_INC']
+ incs += ' ' + '#/extern/glew/include'
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
incs += ' ' + env['BF_BOOST_INC']