Commit Graph

320 Commits

Author SHA1 Message Date
Thomas Dinges
95080ea5cd Freestyle / Scons:
* Changes in tools\Blender.py were not merged, causing compile failure.
2013-04-06 22:21:42 +00:00
Jens Verwiebe
be2626f9f4 Fix freestyle compile with scons 2013-04-06 18:06:06 +00:00
Gaia Clary
4707f1de17 modified build system for updated opencollada libraries (windows only, other platforms might want to update as well) 2013-03-28 18:02:24 +00:00
Sergey Sharybin
31eee77a45 Fix #33518: Jack sync doesn't work in 2.64, 2.64 or 2.65 stable versions
Added new build option WITH_JACK_DYNLOAD for CMake and
WITH_BF_JACK_DYNLOAD for SCons, which means there'll be
no build-time linking against libjack and getting symbols
from libjack will happen runtime using dlopen and dlsym
tricks.

Alternative would be to use weak linking, but it'll require
having wrapper for preloading libjack.

This new options are disabled by default and they only
intended to be used on linux. Other platforms shall not
be using this and there shall be no functional changes
on non-linux platforms at all.
2013-03-27 07:19:54 +00:00
Campbell Barton
41b801ab9c patch [#34525] Scons ' color
by Andrey Izrantsev (bdancer)
2013-03-04 13:59:54 +00:00
Thomas Dinges
dc90ce5b6d Cycles GPU rendering:
* Deprecate computing capability 1.3 (sm_13)

This commit disables auto build of sm_13 CUDA platform, which means that starting with Blender 2.67, we don't support sm_13 devices anymore. It has become difficult to support that and it was already feature incomplete (no render-passes, AO, Multi Closure etc).

It's still possible to manually enable sm_13 for own tests, but building might break in the future.
2013-02-21 17:14:07 +00:00
Brecht Van Lommel
50f7328fb6 Fix scons win32 link error with OSL, also fix a GLEW linker warning 2013-02-10 20:47:44 +00:00
Campbell Barton
76b7afd909 removing xinerama on X11 dependency, this wasn't working very usefully. 2013-02-07 14:10:01 +00:00
Campbell Barton
2c1219dc17 enable xinerama for scons. 2013-02-06 01:28:56 +00:00
Jens Verwiebe
98ecb72379 OSX/cmake/scons: python version foolproof 2013-02-05 19:49:53 +00:00
Bastien Montagne
ad76a8a10c Fix scons building under unix. Now we should really have only *one* '/usr/lib' lib search path, in last position! Previously we could have a bunch of those, even in first position, which would e.g. prevent linking against a custom boost in /opt/lib/boost if you had a system boost installed... 2013-01-31 12:24:12 +00:00
Thomas Dinges
b53c6c180e Cycles:
* One more fix for Boost Linker errors with new OSL master branch.
2013-01-30 22:21:55 +00:00
Antony Riakiotakis
a099bd8bb0 make sure config directory is initialized or python complains 2013-01-22 18:13:22 +00:00
Antony Riakiotakis
8e2dd1c351 Scons, linux: If we are to keep WITH_INTERNATIONAL on by default, also turn on boost by default because it locale libraries are needed 2013-01-22 17:09:10 +00:00
Antony Riakiotakis
10261c4250 a better fix for scons finding pyconfig.h in ubuntu 12.10 2013-01-22 16:40:40 +00:00
Sergey Sharybin
5781859753 Dosvidanya, old compositor!
You served well and now desired retirement, but you'll always live in our hearts.

And for sure -- monument!

       +-------------------------------------------+
      /   ++==+   .  ..   .   ...    .  ..     .  /
     /   //    ++==++  ++  ++     ++==++ ++==++  /
    /   //    //  //  //\\//\\   //  // //  //  /
   /   ++==+ ++==++  //      \\ //==++ ++==++  /
  /  .    ...   ..    .       //  ..  ...     /
 +-------------------------------------------+

Some notes:
- Removed all code which was from inside ifdef WITH_COMPOSITOR_LEGACY
- Removed some functions which were used by old compositor only but
  weren't ported to new color management
- Removed WITH_COMPOSITOR_LEGACY from build systems
- node_composite_util.h was in fatc used by compo nodes specification
  files, so added it back to cmake.

  Could be cleaned up by moving header files to files where they're
  actually needed but would consider this is a separate task.

- Should be no functional changes!
2013-01-14 15:53:17 +00:00
Sergey Sharybin
35d0e99299 Added new scons target: cudakernels
It's intended to perform compilation of CUDA kernels only,
without doing anything with other sources/resources and
main purpose of this target is to be able to compile cuda
kernels in completely different environment than the rest
of blender was compiled.

This is needed for linux build environment, where sm_13
compilation fails dramatically in 32bit chroot but could
be compiled in 64bit environment.
2013-01-10 08:01:07 +00:00
Jens Verwiebe
474b92c76c OSX: take back 53611 for now, give trouble with the local variables in config, guess needs some cleanup 2013-01-08 07:36:22 +00:00
Jens Verwiebe
69dd1b0819 OSX/scons: make 64bit Intel the default now 2013-01-06 18:26:29 +00:00
Thomas Dinges
b3dc1d585a Scons / Windows Release Builds:
* Don't put -release- string into the final .exe name.
blender-2.65-release-windows32.exe --> blender-2.65-windows32.exe
2012-12-20 08:54:37 +00:00
Bastien Montagne
b481ec92e4 Minor tweaks to some UI messages... 2012-12-17 20:16:37 +00:00
Sergey Sharybin
e00e649063 SCons: clean up code which was commented out since 2007 2012-12-14 12:06:24 +00:00
Sergey Sharybin
7fe2ac8e9a SCons; cleanup linux-config.py from using deprecated libraries from svn
This was already done for CMake and mentioning this paths in scons only
messes things up.
2012-12-14 12:06:09 +00:00
Sergey Sharybin
d4cd823912 SCons: added static libs path for OIIO, OCIO and Boost
This should make it easier to write user-config.py

Still not sure how to deal with OSL and LLVM in a nice way, they're currently
using some hacks which didn't support specifying this libraries as static.
2012-12-13 16:55:54 +00:00
Jens Verwiebe
8af6721eb5 OSX: make cmake and scons both compile jack and ndof with newer sdk's 2012-12-12 19:54:14 +00:00
Brecht Van Lommel
dbd44e3bf5 Fix scons not installing closure/ directory for runtime compiles of CUDA kernel. 2012-12-03 16:51:05 +00:00
Campbell Barton
a7555a81c7 remove unmaintained eltopo, keeping scons/cmake entries, but commenting out user visible config to make branch merging less of a hassle. 2012-11-27 09:52:20 +00:00
Campbell Barton
0a5d44588c switch verious references from py3.2 -> 3.3 or just 3. 2012-11-26 13:58:06 +00:00
Sergey Sharybin
2d6402c10c Switch windows to python 3.3
Should affect on msvc2008 only, however scons with msvc2010 could still be broken.
2012-11-26 12:38:40 +00:00
Brecht Van Lommel
629ea82a13 Fix 33149: LLVM caused startup crash on linux systems using Mesa llvmpipe.
Now we hide the LLVM symbols with an ld version script to avoid conflicts.
2012-11-21 22:28:15 +00:00
Thomas Dinges
d7ff8855cb Mingw x64:
* Iconv libs have been removed from SVN, disable it. This hopefully fixes the buildbot.
2012-11-20 01:26:21 +00:00
Thomas Dinges
d19339a181 Windows / OSL:
* Enable OSL for Windows and Windows Buildbot.
2012-11-20 00:54:32 +00:00
Jens Verwiebe
eebc9f4922 OSX/osl: link also boost_wave, cause we use its preprocessor now 2012-11-19 19:10:31 +00:00
Brecht Van Lommel
1e98e96f7c Windows Libs: move OpenEXR headers to same directory structure as other platforms. 2012-11-19 16:02:29 +00:00
Brecht Van Lommel
312abf8cb2 SCons: make OSL linking work on windows, and fix OSL compiler path issue to
properly expand to absolute path.
2012-11-19 14:54:35 +00:00
Jens Verwiebe
29fe8abf8d OSX/scons: migration to py 3.3 2012-11-19 10:14:55 +00:00
Campbell Barton
d3d5c57c32 move source/darwin into release/darwin since these files are for osx packaging. 2012-11-18 07:41:38 +00:00
Thomas Dinges
6810813068 OSL / Windows:
* Some fixes for scons, kernel/osl compiles now. 
* Still disabled per default, as relative path to oslc.exe does not work and linking fails.
2012-11-18 03:56:53 +00:00
Brecht Van Lommel
0c12ea0939 Buildbot: show OS X target version in buildbot zip filename. 2012-11-17 23:00:04 +00:00
Jens Verwiebe
d017f34c5d OSX/scons/osl: working but not optimally designed atm 2012-11-16 14:42:04 +00:00
Thomas Dinges
88b26f24e4 Windows x64:
* Fix compile after recent OIIO changes.
2012-11-16 12:18:47 +00:00
Jens Verwiebe
4ece50723b OSX/scons/osl: ready for compile now, little hack to be resolved, todo:fix a crash with shadercompile 2012-11-16 00:43:28 +00:00
Jens Verwiebe
69320ea595 OSX/scons/osl: initial osl compiling, todo: fix shader compile and copy to bundle 2012-11-15 21:35:25 +00:00
Brecht Van Lommel
2324c80f50 Cycles OSL: windows build system changes to support static OSL/OIIO. 2012-11-15 17:16:27 +00:00
Thomas Dinges
1c9b548d92 Windows / Scons OSL:
* Initial support, still commented.
2012-11-15 16:34:22 +00:00
Sergey Sharybin
9eccf40daa 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.
2012-11-15 13:11:12 +00:00
Bastien Montagne
7138beaa64 Fix for oiio/ocio/boost in those scons config, else specifying a custom "root" path for those libs in user-config.py is useless! 2012-11-14 08:12:52 +00:00
Campbell Barton
050f09aa6c buildsystem cleanup: remove duplicate source & includes for scons,
add a check for duplicates in BlenderLib()m, if 0'd now.
2012-11-14 01:41:24 +00:00
Jens Verwiebe
ad5cf1fe9c fix scons compile after introducing BF_BOOST_LIB_INTERNATIONAL 2012-11-12 09:31:10 +00:00
Joshua Leung
c844033cd0 Scons compiling fix
Proper implementation for only including the boost locale libs when
WITH_BF_INTERNATIONAL is enabled, so that those of us who do not need/want to
bother with translated ui's can compile. The way it was done before was wrong as
1) the value was always set to true earlier in the config scripts, 2) the base
config scripts run before user config overrides are set
2012-11-12 02:30:16 +00:00