diff options
| author | Damien Plisson <damien.plisson@yahoo.fr> | 2009-11-09 20:52:13 +0300 |
|---|---|---|
| committer | Damien Plisson <damien.plisson@yahoo.fr> | 2009-11-09 20:52:13 +0300 |
| commit | ff0ba86a9b8caaf744437fa23e1b16af72e0183d (patch) | |
| tree | d9e488ce45e82e4e660d33ba55f84bd3198c39ec /source | |
| parent | 9c0cdd2501eda811829ec9a14cf3b9d1a89966aa (diff) | |
Mac :
- scons update to build with openCollada
- scons & cmake update for render optimization cflags
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/collada/SConscript | 5 | ||||
| -rw-r--r-- | source/blender/render/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | source/blender/render/SConscript | 11 |
3 files changed, 19 insertions, 4 deletions
diff --git a/source/blender/collada/SConscript b/source/blender/collada/SConscript index 7bf2870d6c5..6a1c71c9c86 100644 --- a/source/blender/collada/SConscript +++ b/source/blender/collada/SConscript @@ -4,7 +4,10 @@ Import ('env') sources = env.Glob('*.cpp') # relative paths to include dirs, space-separated, string -incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) +if env['OURPLATFORM']=='darwin': + incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) +else: + incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) env.BlenderLib ('bf_collada', sources, Split(incs), [], libtype='core', priority=200 ) diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 279ba7698b7..294e1966711 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -47,6 +47,13 @@ IF(WITH_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) +IF(APPLE) + IF((CMAKE_OSX_ARCHITECTURES MATCHES "i386") OR (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")) + SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse") + SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse") + ENDIF((CMAKE_OSX_ARCHITECTURES MATCHES "i386") OR (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")) +ENDIF(APPLE) + #TODO #if env['OURPLATFORM']=='linux2': # cflags='-pthread' diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index f89e81708b4..4df94a096b9 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -5,9 +5,14 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'): # FIXME: need to set the appropriate flags for msvc, otherwise we get warnings cflags = [] cxxflags = [] -else: - cflags = ['-O2','-msse2','-mfpmath=sse'] - cxxflags = ['-O2','-msse2','-mfpmath=sse'] + +if env['OURPLATFORM'] == 'darwin': + if env['MACOSX_ARCHITECTURE'] in ('i386', 'x86_64'): + cflags = env['CFLAGS'] + ['-mfpmath=sse'] + cxxflags = env['CXXFLAGS'] + ['-mfpmath=sse'] + else: + cflags = env['CFLAGS'] + cxxflags = env['CXXFLAGS'] sources = env.Glob('intern/source/*.c') raysources = env.Glob('intern/raytrace/*.cpp') |