[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54440] trunk/blender: Fix scons win32 link error with OSL, also fix a GLEW linker warning

[Brecht Van Lommel]

Revision: 54440
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54440
Author:   blendix
Date:     2013-02-10 20:47:44 +0000 (Sun, 10 Feb 2013)
Log Message:
-----------
Fix scons win32 link error with OSL, also fix a GLEW linker warning

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/win32-vc-config.py
    trunk/blender/intern/cycles/SConscript

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py	2013-02-10 20:17:50 UTC (rev 54439)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py	2013-02-10 20:47:44 UTC (rev 54440)
@@ -182,7 +182,7 @@
 WITH_BF_BOOST = True
 BF_BOOST = '${LIBDIR}/boost'
 BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49'
+BF_BOOST_LIB = 'libboost_date_time-vc90-mt-s-1_49 libboost_filesystem-vc90-mt-s-1_49 libboost_regex-vc90-mt-s-1_49 libboost_system-vc90-mt-s-1_49 libboost_thread-vc90-mt-s-1_49 libboost_wave-vc90-mt-s-1_49'
 BF_BOOST_LIB_INTERNATIONAL = 'libboost_locale-vc90-mt-s-1_49'
 BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
 

Modified: trunk/blender/intern/cycles/SConscript
===================================================================
--- trunk/blender/intern/cycles/SConscript	2013-02-10 20:17:50 UTC (rev 54439)
+++ trunk/blender/intern/cycles/SConscript	2013-02-10 20:47:44 UTC (rev 54440)
@@ -43,6 +43,8 @@
 defs = []
 cxxflags = Split(env['CXXFLAGS'])
 
+defs.append('GLEW_STATIC')
+
 defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
 defs.append('CCL_NAMESPACE_END=}')