Fix for fix, now nested
authorJens Verwiebe <info@jensverwiebe.de>
Tue, 7 Aug 2012 12:09:48 +0000 (12:09 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Tue, 7 Aug 2012 12:09:48 +0000 (12:09 +0000)
CMakeLists.txt
intern/cycles/kernel/kernel_types.h

index bc086b563fbeec3eef48d87b26fc06a9fd5c9a37..5f3638094244832c2db74b9821f618f6ed0c5193 100644 (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)
index 7eab2176fa6bff983c417e2e02a4acfb4c990eae..30d45ad111895ffa0c295635e3031e80381ca3c7 100644 (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__