From 50f7328fb6067cf5bf922c00a585886f9e992728 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 10 Feb 2013 20:47:44 +0000 Subject: [PATCH] Fix scons win32 link error with OSL, also fix a GLEW linker warning --- build_files/scons/config/win32-vc-config.py | 2 +- intern/cycles/SConscript | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 21488e75f7e..95352bda8a7 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -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' 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=}')