Revision: 36480
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36480
Author: blendix
Date: 2011-05-04 09:58:02 +0000 (Wed, 04 May 2011)
Log Message:
-----------
Cycles: some more windows build fixes, based on patch by Francisco De La Cruz.
Modified Paths:
--------------
branches/cycles/intern/cycles/cmake/platforms.cmake
branches/cycles/intern/cycles/kernel/CMakeLists.txt
branches/cycles/intern/cycles/util/util_math.h
Modified: branches/cycles/intern/cycles/cmake/platforms.cmake
===================================================================
--- branches/cycles/intern/cycles/cmake/platforms.cmake 2011-05-04 09:41:45 UTC
(rev 36479)
+++ branches/cycles/intern/cycles/cmake/platforms.cmake 2011-05-04 09:58:02 UTC
(rev 36480)
@@ -11,7 +11,7 @@
ENDIF(APPLE)
IF(WIN32)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS /EHsc
/fp:fast")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ox /Ot /arch:SSE2
-D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast")
SET(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
SET(PYTHON_MODULE_FLAGS "-DLL")
ENDIF(WIN32)
Modified: branches/cycles/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- branches/cycles/intern/cycles/kernel/CMakeLists.txt 2011-05-04 09:41:45 UTC
(rev 36479)
+++ branches/cycles/intern/cycles/kernel/CMakeLists.txt 2011-05-04 09:58:02 UTC
(rev 36480)
@@ -71,6 +71,12 @@
# CUDA module
+IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+ SET(CUDA_BITS 64)
+ELSE()
+ SET(CUDA_BITS 32)
+ENDIF()
+
IF(WITH_CYCLES_CUDA)
SET(cuda_sources kernel.cu ${headers})
SET(cuda_cubins)
@@ -80,7 +86,7 @@
ADD_CUSTOM_COMMAND(
OUTPUT ${cuda_cubin}
- COMMAND ${CUDA_NVCC} -arch=${arch} -m64 --cubin
${CMAKE_CURRENT_SOURCE_DIR}/kernel.cu --use_fast_math -o
${CMAKE_CURRENT_BINARY_DIR}/${cuda_cubin} --ptxas-options="-v"
--maxrregcount=${CYCLES_CUDA_MAXREG} --opencc-options -OPT:Olimit=0
-I${CMAKE_CURRENT_SOURCE_DIR}/../util -I${CMAKE_CURRENT_SOURCE_DIR}/svm
-DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END=
+ COMMAND ${CUDA_NVCC} -arch=${arch} -m${CUDA_BITS}
--cubin ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cu --use_fast_math -o
${CMAKE_CURRENT_BINARY_DIR}/${cuda_cubin} --ptxas-options="-v"
--maxrregcount=${CYCLES_CUDA_MAXREG} --opencc-options -OPT:Olimit=0
-I${CMAKE_CURRENT_SOURCE_DIR}/../util -I${CMAKE_CURRENT_SOURCE_DIR}/svm
-DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC
DEPENDS ${cuda_sources})
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${cuda_cubin}
DESTINATION ${CYCLES_INSTALL_PATH}/cycles/lib)
Modified: branches/cycles/intern/cycles/util/util_math.h
===================================================================
--- branches/cycles/intern/cycles/util/util_math.h 2011-05-04 09:41:45 UTC
(rev 36479)
+++ branches/cycles/intern/cycles/util/util_math.h 2011-05-04 09:58:02 UTC
(rev 36480)
@@ -48,9 +48,13 @@
#ifdef _WIN32
+#ifndef __KERNEL_GPU__
+
#define copysignf(x, y) ((float)_copysign(x, y))
#define hypotf(x, y) _hypotf(x, y)
+#endif
+
__device_inline float fmaxf(float a, float b)
{
return (a > b)? a: b;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
