Blender Git Commit Log
Git Commits -> Revision 9eccf40
Revision 9eccf40 by Sergey Sharybin (master) November 15, 2012, 13:11 (GMT) |
OSL Scons rules Initial support of OSL builds using SCons build system. Only tested on Linux now. No changes to configuration files themselves -- for now check how it's configured for linux buildbot (it was already horror to make all this changes and verify them, changes to linux-config.py could easily be done later). Currently WITH_BF_STATICOSL and WITH_BF_STATICLLVM are more like rudiments because linking against oslexec requires special trick with --whole-archive. We woul either need to find a way dealing with this oslexec less hackish or drop STATICOSL and STATICLLVM flags. Will keep dropping this flags for until we have "final" build rules for OSL. Still can not make 32bit linux rendering with OSL -- blender simply crashes when starting rendering. So for time being this issues are solving disabled OSL for 32bit build slaves. |
Commit Details:
Full Hash: 9eccf40daa7edccc6ca9613611c12270cddbd773
SVN Revision: 52229
Parent Commit: abeeea6
Lines Changed: +205, -3
2 Added Paths:
/intern/cycles/kernel/osl/SConscript (+21, -0) (View)
/intern/cycles/kernel/shaders/SConscript (+42, -0) (View)
/intern/cycles/kernel/shaders/SConscript (+42, -0) (View)
8 Modified Paths:
/build_files/buildbot/config/user-config-glibc211-i686.py (+19, -0) (Diff)
/build_files/buildbot/config/user-config-glibc211-x86_64.py (+19, -0) (Diff)
/build_files/buildbot/config/user-config-glibc27-i686.py (+19, -0) (Diff)
/build_files/buildbot/config/user-config-glibc27-x86_64.py (+19, -0) (Diff)
/build_files/scons/tools/Blender.py (+17, -0) (Diff)
/build_files/scons/tools/btools.py (+23, -3) (Diff)
/intern/cycles/SConscript (+10, -0) (Diff)
/SConstruct (+16, -0) (Diff)
/build_files/buildbot/config/user-config-glibc211-x86_64.py (+19, -0) (Diff)
/build_files/buildbot/config/user-config-glibc27-i686.py (+19, -0) (Diff)
/build_files/buildbot/config/user-config-glibc27-x86_64.py (+19, -0) (Diff)
/build_files/scons/tools/Blender.py (+17, -0) (Diff)
/build_files/scons/tools/btools.py (+23, -3) (Diff)
/intern/cycles/SConscript (+10, -0) (Diff)
/SConstruct (+16, -0) (Diff)