[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49648] trunk/blender: Fix for endiantest, xcode condition interferred with other os
jens verwiebe
info at jensverwiebe.de
Tue Aug 7 14:03:45 CEST 2012
Revision: 49648
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49648
Author: jensverwiebe
Date: 2012-08-07 12:03:43 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
Fix for endiantest, xcode condition interferred with other os
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 10:54:50 UTC (rev 49647)
+++ trunk/blender/CMakeLists.txt 2012-08-07 12:03:43 UTC (rev 49648)
@@ -1480,9 +1480,12 @@
# 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)
Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h 2012-08-07 10:54:50 UTC (rev 49647)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h 2012-08-07 12:03:43 UTC (rev 49648)
@@ -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__
More information about the Bf-blender-cvs
mailing list