From b5c439db4748b334a81b12cd134261915e47b3ab Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 30 Jan 2013 21:58:47 +0000 Subject: Fix cycles windows link errors when building with OSL master branch. --- CMakeLists.txt | 7 ++++++- intern/cycles/CMakeLists.txt | 1 + intern/cycles/SConscript | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59dbeaed36b..e400380390f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1136,11 +1136,16 @@ elseif(WIN32) debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX} debug libboost_regex-${BOOST_DEBUG_POSTFIX} debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX}) + if(WITH_CYCLES_OSL) + set(BOOST_LIBRARIES ${BOOST_LIBRARIES} + optimized libboost_wave-${BOOST_POSTFIX} + debug libboost_wave-${BOOST_DEBUG_POSTFIX}) + endif() if(WITH_INTERNATIONAL) set(BOOST_LIBRARIES ${BOOST_LIBRARIES} optimized libboost_locale-${BOOST_POSTFIX} debug libboost_locale-${BOOST_DEBUG_POSTFIX}) - endif(WITH_INTERNATIONAL) + endif() set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB") endif() diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 048a2a50a7f..535239a9205 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -44,6 +44,7 @@ endif() if(WITH_CYCLES_OSL) add_definitions(-DWITH_OSL) + add_definitions(-DOSL_STATIC_LIBRARY) include_directories(${OSL_INCLUDES}) endif() diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 44a17ac0cd6..19af7dede9f 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -51,6 +51,7 @@ defs.append('WITH_CUDA') if env['WITH_BF_CYCLES_OSL']: defs.append('WITH_OSL') + defs.append('OSL_STATIC_LIBRARY') incs.append(cycles['BF_OSL_INC']) incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split()) -- cgit v1.2.3