Commit Graph

756 Commits

Author SHA1 Message Date
Campbell Barton
0dd6988a1e add PHY headers to cmake's ketsji (else some IDE's won't show) 2013-02-26 23:08:42 +00:00
Brecht Van Lommel
4f3ca854e1 Fix various warnings with clang build, and adjust cmake clang warnings flags
to include a few more that gcc is using too.
2013-02-26 21:58:06 +00:00
Thomas Dinges
92a77d3f0b install_deps.sh:
* Disable OIIO test and cmd tools per default, they are not needed for Blender.
2013-02-24 11:54:28 +00:00
Bastien Montagne
92189ab353 Rename CMake's Boost_USE_ICU to WITH_BOOST_ICU (update your CMake conf if you make static builds!), and add it as CMake option.
Patch by gdh (Gavin Howard), many thanks!
2013-02-23 20:42:15 +00:00
Thomas Dinges
31e6af92c8 Install_deps script:
* Use OIIO 1.1.7, this removes the need for the ugly patch.
* Use official OSL 1.3.0 repo
* Print OSL path for scons

Tested on Ubuntu 12.10 x64.
2013-02-23 00:52:59 +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
Sergey Sharybin
a85a0f57bc Buildbot: revert r54465 and r54466 -- issue was not caused by
crosscompilation, but was caused by some bugs in toolkit itself.

Shall be all fine now (at least it is on my laptop now).

Let give it another try!
2013-02-12 08:30:12 +00:00
Sergey Sharybin
eb723ad555 Buildbot: -WITHOUT_BF_OVERWRITE_INSTALL should not be needed now 2013-02-11 13:44:18 +00:00
Sergey Sharybin
6888d6eac8 Buildbot: switch to using native toolkit again
Crosscompiling of cubins doesn't work on linux with toolkit 4.2,
so use native toolkit for now. Disabled sm_13 for 32bit platform
for now.

Would keep cudakernels build target for a while. It doesn't hurt
being in the code and it could be helpful again once we'll switch
to toolkit 5.x where crosscompilation works fine.

Some further tweaks could probably be needed still, let's see how
building goes on buildbot now :)
2013-02-11 13:39:22 +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
a78cf854b4 add missing bullet header to cmake, quiet reports from 'make test_cmake' 2013-02-06 04:16:28 +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
Campbell Barton
43af754e4f cmake config files BOOL type was ignored by cmake. 2013-01-30 07:33:26 +00:00
Campbell Barton
8a60c7dc7d fix for missing initialization of vert data in ccgDM_copyFinalVertArray 2013-01-24 09:36:22 +00:00
Campbell Barton
a790c8c6f9 patch [#33969] fix for [#33968] Blenders Custom Project File Generator for QtCreator fails
from Philipp Oeser (lichtwerk)
2013-01-24 08:59:48 +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
Campbell Barton
769ab3eed8 code cleanup:
- cycles ui used 'cscene' for scene.cycles and scene.cycles_curves
- style cleanup
2013-01-15 23:17:45 +00:00
Sergey Sharybin
f687ad1c4f Cuda binaries workaround for buildbot shall no longer be needed. 2013-01-14 17:30:41 +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
dc4636827b Buildbot: fix for missing CUDA compute after recent changes
Issue was caused by how CUDA devices availability done in Cycles.
Basically, if there's no WITH_CUDA_BINARIES buildtime, nvcc becomes
mandatory dependency.

Since kernels are building in separate target now, this logic broke
a bit.

Perhaps condition in util_cuda shall be changed to be a bit smarter,
but for now just work-around by enabling CUDA binaries when building
Cycles. Made it empty arch list to be sure no kernels will try to
re-compile after cudakernels target is done.
2013-01-12 19:17:50 +00:00
Sergey Sharybin
53ad8274b0 Stripping and packaging shall happen inside of chroot as well 2013-01-10 09:21:12 +00:00
Sergey Sharybin
93c82483c7 Further tweaks to buildbot
- BF_BITNESS should be passed as a command line argument
- Made it so CUDA binaries and OSL compiled scripts would
  be installed regardless WITH_BF_PYTHON (which seems to
  be quite obvious)
- Disable overwrite install, so CUDA kernels installed by
  it's build target will be preserved when building blender
  itself.
2013-01-10 08:55:44 +00:00
Sergey Sharybin
2a43380ded Switch linux buildbot to compile all cuda kernels in 64bit environment
Solves memory limit issues when building sm_13 for 32bit platform.

Some further refinement of patch could be needed.
2013-01-10 08:01:19 +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
Sergey Sharybin
a4ba448529 Remove glibc27 from buildbot scripts 2013-01-09 13:46:59 +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
Campbell Barton
d22c8cfca3 add error check for qtcreator&netbeans project file generators to quit early if cmake fails. 2013-01-07 14:25:26 +00:00
Jens Verwiebe
69dd1b0819 OSX/scons: make 64bit Intel the default now 2013-01-06 18:26:29 +00:00
Bastien Montagne
e0869db01f Patch from Ejner Fergo: enhancements to install_deps.sh.
Mostly, it:
* Adds numpy and opencollada
* Merges both Suse and Fedora/Redhat into a single func (not sure this is a good idea, but would have been to painful to undo this).

Notes:
* I changed a bit how numpy is handled, so that the script does not try to build it when py3.3 was installed from package!
* Bumped oiio 'magic number', as now trying to use libtiff5 means we have to rebuild everything using tiff!
* Only made a quick test on my own system, but Ejner made quite some extensive ones, so it should be safe.
* I’m not sure keeping on extending that horrible bash thing is a good idea. Shell scripts are nice for small, limited stuff, but I personnaly find that one (over 53ko!) unreadable and a pita to maintain. Further more, doing the same for windows would mean to rewrite everything in another language... I have started work to port this as a py3 script, so that we have a nice structure (classes...) easy to extend/tweak/implement in various OSs/etc.!
2013-01-03 15:35:46 +00:00
Campbell Barton
c2839bfe76 add option WITH_SYSTEM_BULLET to link against the bullet installation found on the system.
Note: this doesn't work yet for everything with latest stable bullet (2.81), need to look into why and likely apply some patches upstream.
However I managed to link blender by disabling some features, likely it can be made to work without too much trouble.
2013-01-03 00:23:52 +00:00
Campbell Barton
80ff313495 patch [#33331] Time To Start Moving To Stdbool
by Lawrence D'Oliveiro (ldo)

so BKE_utildefines.h allows use of C99's bool type and true/false.

currently scons wont try to use stdbool.h, and works as if its never found.
2013-01-01 12:47:58 +00:00
Campbell Barton
c9d16fd22c add ".hh" as an extension for source scripts. 2012-12-31 07:06:51 +00:00
Dan Eicher
19c4ae50e4 Add datafiles/locale/languages to blender.spec.in for CPack 2012-12-28 23:30:34 +00:00
Sergey Sharybin
ba868f1c50 Buildbot: disable Jack for now, it doesn't work when linked statically
No easy build configuration fix for this, need to be switched to more
like a plugin system to support jack.
2012-12-21 09:37:43 +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
10fdfb54b5 Minor enhancements to end message of build_deps.sh 2012-12-19 11:07:10 +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
Sergey Sharybin
892d21631b Install dependencies used to always mark schro as used for suse.
Now it should respect all features option.

Also removed some duplicated entries.
2012-12-11 19:45:16 +00:00
Brecht Van Lommel
ea464b9659 OSL install deps script: set STOP_ON_WARNING to OFF to disable -Werror. 2012-12-11 08:13:56 +00:00
Campbell Barton
7376fb2913 make cppcheck run with quiet flag when QUIET env var is set, make bpy.ops.image.project_apply() only use local images. 2012-12-09 14:17:33 +00:00