Fix scons win32 link error with OSL, also fix a GLEW linker warning
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Sun, 10 Feb 2013 20:47:44 +0000 (20:47 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Sun, 10 Feb 2013 20:47:44 +0000 (20:47 +0000)
build_files/scons/config/win32-vc-config.py
intern/cycles/SConscript

index 21488e7..95352bd 100644 (file)
@@ -182,7 +182,7 @@ WITH_BF_STATICOCIO = True
 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'
 
index 8a8ef9c..7b4d2db 100644 (file)
@@ -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=}')