← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to build_files/scons/config/darwin-config.py

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
build_files/scons/config/darwin-config.py
34
34
    MAC_CUR_VER='10.7'
35
35
elif cmd_res[:2]=='12':
36
36
    MAC_CUR_VER='10.8'
 
37
elif cmd_res[:2]=='13':
 
38
    MAC_CUR_VER='10.9'
37
39
cmd = 'xcodebuild -version'
38
40
cmd_xcode=commands.getoutput(cmd)
39
41
XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
40
42
cmd = 'xcodebuild -showsdks'
41
43
cmd_sdk=commands.getoutput(cmd)
42
44
MACOSX_SDK_CHECK=cmd_sdk
 
45
cmd = 'xcode-select --print-path'
 
46
XCODE_SELECT_PATH=commands.getoutput(cmd)
 
47
if XCODE_SELECT_PATH.endswith("/Contents/Developer"):
 
48
        XCODE_BUNDLE=XCODE_SELECT_PATH[:-19]
 
49
else:
 
50
        XCODE_BUNDLE=XCODE_SELECT_PATH
43
51
 
44
52
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
45
53
    USE_QTKIT=True # Carbon quicktime is not available for 64bit
97
105
LIBDIR = '${LCGDIR}'
98
106
 
99
107
if XCODE_CUR_VER >= '4.3':  ## since version 4.3, XCode and developer dir are bundled ##
100
 
        MACOSX_SDK = '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform' + MACOSX_SDK
 
108
        MACOSX_SDK = XCODE_BUNDLE + '/Contents/Developer/Platforms/MacOSX.platform' + MACOSX_SDK
101
109
 
102
110
#############################################################################
103
111
###################          Dependency settings           ##################
105
113
 
106
114
#Defaults openMP to true if compiler handles it ( only gcc 4.6.1 and newer )
107
115
# if your compiler does not have accurate suffix you may have to enable it by hand !
108
 
if CC[:-2].endswith('4.6'):
 
116
if CC[:-2].endswith('4.6') or CC[:-2].endswith('4.8'):
109
117
    WITH_BF_OPENMP = True  # multithreading for fluids, cloth, sculpt and smoke
110
118
else:
111
119
    WITH_BF_OPENMP = False
348
356
CXXFLAGS = []
349
357
CCFLAGS = ['-pipe','-funsigned-char']
350
358
 
 
359
 
351
360
CPPFLAGS = list(ARCH_FLAGS)
352
361
 
353
362
if WITH_GHOST_COCOA:
367
376
 
368
377
#note to build succesfully on 10.3.9 SDK you need to patch  10.3.9 by adding the SystemStubs.a lib from 10.4
369
378
#for > 10.7.sdk, SystemStubs needs to be excluded (lib doesn't exist anymore)
370
 
if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk"):
 
379
if MACOSX_SDK.endswith("10.7.sdk") or MACOSX_SDK.endswith("10.8.sdk") or MACOSX_SDK.endswith("10.9.sdk"):
371
380
    LLIBS = ['stdc++']
372
381
else:
373
382
    LLIBS = ['stdc++', 'SystemStubs']