[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49643] trunk/blender: OSX/cmake: Mountain-Lion (10.8 )adaptions, skip unsupported endianess etc., todo: deployment target management

[jens verwiebe]

Revision: 49643
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49643
Author:   jensverwiebe
Date:     2012-08-07 10:02:34 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
OSX/cmake: Mountain-Lion (10.8 )adaptions, skip unsupported endianess etc., 
todo: deployment target management

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 09:54:55 UTC (rev 49642)
+++ trunk/blender/CMakeLists.txt        2012-08-07 10:02:34 UTC (rev 49643)
@@ -271,7 +271,9 @@
        endif()
        
        execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for 
actual system-version
-       if (${MAC_SYS} MATCHES 11)
+       if (${MAC_SYS} MATCHES 12)
+               set(OSX_SYSTEM 10.8)
+       elseif (${MAC_SYS} MATCHES 11)
                set(OSX_SYSTEM 10.7)
        elseif(${MAC_SYS} MATCHES 10)
                set(OSX_SYSTEM 10.6)
@@ -1478,7 +1480,7 @@
 
 
 # set the endian define
-if(MSVC)
+if(MSVC OR ${XCODE_VERSION} VERSION_GREATER 4.3) # no more ppc support in 
xcode > 4.3
        # for some reason this fails on msvc
        add_definitions(-D__LITTLE_ENDIAN__)
 else()

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h   2012-08-07 09:54:55 UTC 
(rev 49642)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h   2012-08-07 10:02:34 UTC 
(rev 49643)
@@ -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
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs