[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41588] branches/cycles/CMakeLists.txt: Cycles:

Thomas Dinges blender at dingto.org
Sun Nov 6 15:09:08 CET 2011


Revision: 41588
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41588
Author:   dingto
Date:     2011-11-06 14:09:08 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Cycles:
Use new libs on win32/64. Make sure you update lib/windows or lib/win64. 

Modified Paths:
--------------
    branches/cycles/CMakeLists.txt

Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt	2011-11-06 14:08:04 UTC (rev 41587)
+++ branches/cycles/CMakeLists.txt	2011-11-06 14:09:08 UTC (rev 41588)
@@ -838,13 +838,8 @@
 		if(WITH_BOOST)
 			set(BOOST ${LIBDIR}/boost)
 			set(BOOST_INCLUDE_DIR ${BOOST}/include)
-			if(CMAKE_CL_64)
-				set(BOOST_POSTFIX "vc90-mt-s-1_45.lib")
-				set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_45.lib")
-			else()
-				set(BOOST_POSTFIX "vc90-mt-s-1_46_1.lib")
-				set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_46_1.lib")
-			endif()
+			set(BOOST_POSTFIX "vc90-mt-s-1_47.lib")
+			set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_47.lib")
 			set(BOOST_LIBRARIES
 				optimized libboost_date_time-${BOOST_POSTFIX} libboost_filesystem-${BOOST_POSTFIX}
 				libboost_regex-${BOOST_POSTFIX} libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX}




More information about the Bf-blender-cvs mailing list