diff options
author | Jens Verwiebe <info@jensverwiebe.de> | 2012-08-07 16:09:48 +0400 |
---|---|---|
committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-08-07 16:09:48 +0400 |
commit | 9ee3a8655fe35af2fdca6c54953da93ed42111a3 (patch) | |
tree | ad49936101317defc1ced7c33f6143859111706b | |
parent | d4029de0d640633365b884f0330f02e864aed41e (diff) |
Fix for fix, now nested
-rw-r--r-- | CMakeLists.txt | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bc086b563fb..5f363809424 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 7eab2176fa6..30d45ad1118 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -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__ |