Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for fix, now nested

Browse Source
This commit is contained in:
Jens Verwiebe
2012-08-07 12:09:48 +00:00
parent d4029de0d6
commit 9ee3a8655f
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -1483,9 +1483,11 @@ endif()
if(MSVC)
# for some reason this fails on msvc
add_definitions(-D__LITTLE_ENDIAN__)
elseif(APPLE AND ${XCODE_VERSION} VERSION_GREATER 4.3)
# no more ppc support in xcode > 4.3
add_definitions(-D__LITTLE_ENDIAN__)
elseif(APPLE)
if (${XCODE_VERSION} VERSION_GREATER 4.3)
# no more ppc support in xcode > 4.3
add_definitions(-D__LITTLE_ENDIAN__)
endif()
else()
include(TestBigEndian)
test_big_endian(_SYSTEM_BIG_ENDIAN)

12
intern/cycles/kernel/kernel_types.h
View File

@@ -61,12 +61,12 @@ CCL_NAMESPACE_BEGIN
#endif
#ifdef __KERNEL_OPENCL_APPLE__
#define __SVM__
#define __EMISSION__
#define __IMAGE_TEXTURES__
#define __HOLDOUT__
#define __PROCEDURAL_TEXTURES__
#define __EXTRA_NODES__
//#define __SVM__
//#define __EMISSION__
//#define __IMAGE_TEXTURES__
//#define __HOLDOUT__
//#define __PROCEDURAL_TEXTURES__
//#define __EXTRA_NODES__
#endif
#ifdef __KERNEL_OPENCL_AMD__