Fix for endiantest, xcode condition interferred with other os
authorJens Verwiebe <info@jensverwiebe.de>
Tue, 7 Aug 2012 12:03:43 +0000 (12:03 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Tue, 7 Aug 2012 12:03:43 +0000 (12:03 +0000)
CMakeLists.txt
intern/cycles/kernel/kernel_types.h

index 88f0b56a0059ed3606da608eff22200c34b0aea1..bc086b563fbeec3eef48d87b26fc06a9fd5c9a37 100644 (file)
@@ -1480,9 +1480,12 @@ endif()
 
 
 # set the endian define
-if(MSVC OR ${XCODE_VERSION} VERSION_GREATER 4.3) # no more ppc support in xcode > 4.3
+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__)
 else()
        include(TestBigEndian)
        test_big_endian(_SYSTEM_BIG_ENDIAN)
index 30d45ad111895ffa0c295635e3031e80381ca3c7..7eab2176fa6bff983c417e2e02a4acfb4c990eae 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__