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
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-02-11 00:47:44 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-02-11 00:47:44 +0400
commit50f7328fb6067cf5bf922c00a585886f9e992728 (patch)
treed59d8d63477e3c57b0bda47511d92fd4d3550814 /intern
parent41500e28243a0395f5e5117471df4061f16b287a (diff)
Fix scons win32 link error with OSL, also fix a GLEW linker warning
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/SConscript2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
index 8a8ef9cce39..7b4d2db6861 100644
--- a/intern/cycles/SConscript
+++ b/intern/cycles/SConscript
@@ -43,6 +43,8 @@ incs = []
defs = []
cxxflags = Split(env['CXXFLAGS'])
+defs.append('GLEW_STATIC')
+
defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
defs.append('CCL_NAMESPACE_END=}')