diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-07-28 23:03:42 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-07-28 23:03:42 +0400 |
| commit | e3e9cab1498acfb2c9a3cc9133bbb0cb6c263670 (patch) | |
| tree | b5dc44c6d013ad931a10889fb64f398f5200505a /build_files | |
| parent | 6355e3a45d1dd26b09713ece4c353bc890fd129c (diff) | |
OSX/buildbot: Fix 32bit compile by removing OSL/LLVM and add back UTF to Collada
- due OSL i386 never worked on OSX, the new libs do not even contain this arch !
- As we had to fix duplicated symbols from generic UTF finctions same in LLVM and COLLADA,
LLVM-less build must have UTF lib reenabled
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/config/user-config-mac-i386.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build_files/buildbot/config/user-config-mac-i386.py b/build_files/buildbot/config/user-config-mac-i386.py index 296b752649d..dc741258fac 100644 --- a/build_files/buildbot/config/user-config-mac-i386.py +++ b/build_files/buildbot/config/user-config-mac-i386.py @@ -3,3 +3,8 @@ MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64 WITH_BF_CYCLES_CUDA_BINARIES = True +WITH_BF_CYCLES_OSL = False # OSL never worked on OSX 32bit ! +WITH_BF_LLVM = False # no OSL -> no LLVM -> OpenCollada must have libUTF.a then ! + +BF_OPENCOLLADA_LIB = 'OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa UTF' + |