Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OSX/cmake: Mountain-Lion (10.8 )adaptions, skip unsupported endianess etc., todo: deployment target management

Browse Source
This commit is contained in:
Jens Verwiebe
2012-08-07 10:02:34 +00:00
parent 8ae89f4942
commit b9c441536c
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -271,7 +271,9 @@ if(APPLE)
endif() endif()
execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version 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) set(OSX_SYSTEM 10.7)
elseif(${MAC_SYS} MATCHES 10) elseif(${MAC_SYS} MATCHES 10)
set(OSX_SYSTEM 10.6) set(OSX_SYSTEM 10.6)
@@ -1478,7 +1480,7 @@ endif()
# set the endian define # 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 # for some reason this fails on msvc
add_definitions(-D__LITTLE_ENDIAN__) add_definitions(-D__LITTLE_ENDIAN__)
else() else()

12
intern/cycles/kernel/kernel_types.h
View File

@@ -61,12 +61,12 @@ CCL_NAMESPACE_BEGIN
#endif #endif
#ifdef __KERNEL_OPENCL_APPLE__ #ifdef __KERNEL_OPENCL_APPLE__
//#define __SVM__ #define __SVM__
//#define __EMISSION__ #define __EMISSION__
//#define __IMAGE_TEXTURES__ #define __IMAGE_TEXTURES__
//#define __HOLDOUT__ #define __HOLDOUT__
//#define __PROCEDURAL_TEXTURES__ #define __PROCEDURAL_TEXTURES__
//#define __EXTRA_NODES__ #define __EXTRA_NODES__
#endif #endif
#ifdef __KERNEL_OPENCL_AMD__ #ifdef __KERNEL_OPENCL_AMD__