[Bf-blender-cvs] [e3e9cab] master: 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

[Jens Verwiebe]

Commit: e3e9cab1498acfb2c9a3cc9133bbb0cb6c263670
Author: Jens Verwiebe
Date:   Mon Jul 28 21:03:42 2014 +0200
Branches: master
https://developer.blender.org/rBe3e9cab1498acfb2c9a3cc9133bbb0cb6c263670

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

===================================================================

M	build_files/buildbot/config/user-config-mac-i386.py

===================================================================

diff --git a/build_files/buildbot/config/user-config-mac-i386.py b/build_files/buildbot/config/user-config-mac-i386.py
index 296b752..dc74125 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'
+