Commit Graph

779 Commits

Author SHA1 Message Date
Tamito Kajiyama
eeb95280be Missing build_files updates in the merger in revision 55847. 2013-04-07 06:44:33 +00:00
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
Bastien Montagne
d070940192 More fixes for install_deps.sh under ubuntu 10.04: git package is called "git-core", and 'apt-cache policy' returns a different result than newer versions when no package is found, changed the "available deb package" test to use "apt-cache show" instead. 2013-04-05 13:34:32 +00:00
Bastien Montagne
4cfffd863b First fix for install_deps and ubuntu 10.04 (no libtiff5, only libtiff4, wonder why this package does not work as jpeg or png ones)...
This allows compilation of OIIO, install_deps.sh still working though (on this old OS, all libs have to be compiled, takes time... :/).
2013-04-05 12:37:48 +00:00
Campbell Barton
c7e2a31bf2 correct too-big allocation in mesh beautify. 2013-04-01 07:57:33 +00:00
Bastien Montagne
467526545f Use same opencollada rev as windows' libs. 2013-03-28 20:24:36 +00:00
Campbell Barton
8e3d590b76 code cleanup: python/pep8 and double-promotion warnings. 2013-03-28 19:33:14 +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
Bastien Montagne
d9eadf442e Fix for opencollada building in install_deps.sh script.
Stick to rev c89cf095c40aa2a518b1104c448825eacc92d174 of opencollada repo, next commit breaks API and prevent blender from building anymore... :(
2013-03-23 17:28:24 +00:00
Bastien Montagne
3949e23ddf Patch [#34680] Updated install_deps script, by Ejner Fergo (ejnersan), thanks!
The script is updated with:

Arch Linux support
Numpy 1.7.0 final
Fedora 17 / 18 support
OpenSUSE 12.2 / 12.3 support
Use FFMPEG from RPM-distro repos
RPM-distro fixes
Removed Schroedinger codec
Fixes for Cmake/Scons config

Reviewed by Sergey and me.
2013-03-22 16:26:33 +00:00
Campbell Barton
d9c9209608 code cleanup: quiet some -Wshadow warnings, mix of obvious mistakes and harmless global/local naming conflict. 2013-03-15 22:55:10 +00:00
Campbell Barton
6a51379bf7 tweaks to clang so blender can build with -Werror 2013-03-14 07:25:54 +00:00
Campbell Barton
aff410b558 style cleanup: odd indentation 2013-03-14 05:52:30 +00:00
Sergey Sharybin
36887c0ed0 Woops, installing dlls shall happen after all the folders are created. 2013-03-12 09:24:52 +00:00
Sergey Sharybin
ff65a6d457 Made a mistake in recent windows buildbot tweaks.
Didn't count indentation correct..
2013-03-12 09:19:38 +00:00
Campbell Barton
660be3da39 use gcc warning -Wredundant-decls, exposes some odd/duplicate declarations which have been removed. 2013-03-11 20:27:38 +00:00
Sergey Sharybin
b93c44b8cc Mixed paths to redist libraries in recent commit 2013-03-11 14:16:41 +00:00
Sergey Sharybin
1a0789dc72 Windows buildbot tweaks
Make it so install directory is being nicely
cleaned before next build, which makes it
automatically removing all old files from
previous installations.
2013-03-11 10:49:51 +00:00
Sergey Sharybin
ed1c22db00 Fix first regression introduced with r55173: need to import shutil before using methods from it
Otherwise linux buildbot fails dramatically.

That revision also leads to msvc runtime libs being removed, will fix this
in separate commit.

Take more respect for such creepy as linux and windows platforms, they're not so bad!
2013-03-11 09:11:46 +00:00
Brecht Van Lommel
c142698fb7 Buildbot: mac configuration files for i386 and x86_64. 2013-03-10 17:45:31 +00:00
Campbell Barton
41b801ab9c patch [#34525] Scons ' color
by Andrey Izrantsev (bdancer)
2013-03-04 13:59:54 +00:00
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