Revision: 49649
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49649
Author: jensverwiebe
Date: 2012-08-07 12:09:48 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
Fix for fix, now nested
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/intern/cycles/kernel/kernel_types.h
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-08-07 12:03:43 UTC (rev 49648)
+++ trunk/blender/CMakeLists.txt 2012-08-07 12:09:48 UTC (rev 49649)
@@ -1483,9 +1483,11 @@
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)
Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h 2012-08-07 12:03:43 UTC
(rev 49648)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h 2012-08-07 12:09:48 UTC
(rev 49649)
@@ -61,12 +61,12 @@
#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__
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
