[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54217] trunk/blender: Fix cycles windows link errors when building with OSL master branch.

[Brecht Van Lommel]

Revision: 54217
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54217
Author:   blendix
Date:     2013-01-30 21:58:47 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
Fix cycles windows link errors when building with OSL master branch.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/intern/cycles/CMakeLists.txt
    trunk/blender/intern/cycles/SConscript

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-01-30 21:17:38 UTC (rev 54216)
+++ trunk/blender/CMakeLists.txt	2013-01-30 21:58:47 UTC (rev 54217)
@@ -1136,11 +1136,16 @@
 				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()
 			

Modified: trunk/blender/intern/cycles/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/CMakeLists.txt	2013-01-30 21:17:38 UTC (rev 54216)
+++ trunk/blender/intern/cycles/CMakeLists.txt	2013-01-30 21:58:47 UTC (rev 54217)
@@ -44,6 +44,7 @@
 
 if(WITH_CYCLES_OSL)
 	add_definitions(-DWITH_OSL)
+	add_definitions(-DOSL_STATIC_LIBRARY)
 	include_directories(${OSL_INCLUDES})
 endif()
 

Modified: trunk/blender/intern/cycles/SConscript
===================================================================
--- trunk/blender/intern/cycles/SConscript	2013-01-30 21:17:38 UTC (rev 54216)
+++ trunk/blender/intern/cycles/SConscript	2013-01-30 21:58:47 UTC (rev 54217)
@@ -51,6 +51,7 @@
 
 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())