Revision: 46880
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46880
Author: psy-fi
Date: 2012-05-22 12:30:37 +0000 (Tue, 22 May 2012)
Log Message:
-----------
Disable building of CUDA 1.3 kernels for cycles for win32 cmake and mingw32
scons. They were already disabled for scons MSVC 32bit.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/scons/config/win32-mingw-config.py
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-05-22 12:03:56 UTC (rev 46879)
+++ trunk/blender/CMakeLists.txt 2012-05-22 12:30:37 UTC (rev 46880)
@@ -238,8 +238,14 @@
option(WITH_CYCLES "Enable cycles Render
Engine" ON)
option(WITH_CYCLES_TEST "Build cycles test
application" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA
architectures to build binaries for")
+if(WIN32 AND NOT CMAKE_CL_64 AND NOT WITH_MINGW64)
+ set(PLATFORM_DEFAULT sm_20 sm_21)
+else()
+ set(PLATFORM_DEFAULT sm_13 sm_20 sm_21)
+endif()
+set(CYCLES_CUDA_BINARIES_ARCH ${PLATFORM_DEFAULT} CACHE STRING "CUDA
architectures to build binaries for")
mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
+unset(PLATFORM_DEFAULT)
# disable for now, but plan to support on all platforms eventually
option(WITH_MEM_JEMALLOC "Enable malloc replacement
(http://www.canonware.com/jemalloc)" OFF)
Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py
2012-05-22 12:03:56 UTC (rev 46879)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py
2012-05-22 12:30:37 UTC (rev 46880)
@@ -169,6 +169,11 @@
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
+#CUDA
+WITH_BF_CYCLES_CUDA_BINARIES = False
+#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until
the compile can fit in 32bit process again :)
+
##
CC = 'gcc'
CXX = 'g++'
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
