diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2012-08-07 14:02:34 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-08-07 14:02:34 +0400 |
| commit | b9c441536c7859ba6b26f3f90e281ee22dda147a (patch) | |
| tree | 42dd4cbbcbb68e9ac416bd002d19599d95b4bfdb | |
| parent | 8ae89f494225d59f8d28b453e0939a94a9d3ec9d (diff) | |
OSX/cmake: Mountain-Lion (10.8 )adaptions, skip unsupported endianess etc., todo: deployment target management
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 83809e2cd00..88f0b56a005 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -271,7 +271,9 @@ if(APPLE) 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 @@ endif() # 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() diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 30d45ad1118..7eab2176fa6 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -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__ |