kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
42,503 Commits 2 Branches 0 Tags 753 MiB
afd42031a9
Commit Graph

268 Commits

Author SHA1 Message Date
Campbell Barton
004f8d78ed default to Python3.3 on Linux for SCons and CMake, warn when building with python 3.2x or older. 
also remove casts to keep Python3.2 warning quiet.
 2012-11-05 13:48:42 +00:00
Sergey Sharybin
c75b6c854c Buildbot: use proper archive name for glibc2.11 archives 2012-10-29 16:07:16 +00:00
Sergey Sharybin
b9e652a669 SCons: more libraries could be specified to be static now 
Jack, jpeg, png, openmp, opencollada libraris now could be forced to be static
 2012-10-27 13:22:36 +00:00
Campbell Barton
226a5ee834 remove LOD_Decimator (c++ decimator), now replaced by bmesh decimator. also remove CTR c++ classes that are no longer used. 2012-10-22 02:39:26 +00:00
Campbell Barton
589ada7f0c code cleanup: correct spelling 2012-09-28 06:45:20 +00:00
Thomas Dinges
c39ac85899 Cycles: 
* Change Addons Link to point to the manual instead of the dev documentation. 
* Add sm_30 to Linux build configuration.
 2012-09-21 17:53:52 +00:00
Joshua Leung
aecb2f7039 Updating mingw32 config to reflect new boost libraries in svn 
(1.47 -> 1.49)
 2012-09-17 12:05:18 +00:00
Antony Riakiotakis
3968b63735 * Enable opencolorio for scons/mingw32 (coming very soon) 
* Change names of libraries for mingw32 boost to 1.49
 2012-09-16 20:26:28 +00:00
Antony Riakiotakis
237a9fde92 Enable OpenColorIO for MinGW64 build targets 2012-09-16 18:05:32 +00:00
Thomas Dinges
9e1b13da56 * Disable building of Legacy Compositor in Scons. 2012-09-15 12:32:30 +00:00
Sergey Sharybin
b93da9b01e Color Management, Stage 1: Initial OpenColorIO library integration 
This commit integrates support of OpenColorIO library into build systems.

It also contains C-API for OpenColorIO library which could be used by Blender.

CMake has got find rules familiar to OpenImageIO's one which makes it easier
for build system to find needed libraries and includes. Scons only could use
explicitly defined paths to libraries and includes.

C-API would be compiled and Blender would be linked against C-API and OpenColorIO
but it wouldn't affect on Blender behavior at all.

OpenColorIO could be disabled by setting up WITH_OCIO to Off in CMake and
setting WITH_BF_OCIO in Scons.
 2012-09-15 10:03:17 +00:00
Antony Riakiotakis
bcb552ef94 Enable shader model 3.0 shaders for mingw compilers 2012-09-01 14:53:01 +00:00
Antony Riakiotakis
3793e178f4 Turn OpenMP off for MinGW64. I thought it behaved correctly in new compiler builds but unfortunately it looks like there is some issue still which mostly shows when openmp threads stop. This causes crashes after rendering with subsurf, multires, when calculating fluids and possibly when other functionality is used as well. 
This should make MinGW64 builds quite stable again :)
 2012-08-22 00:06:09 +00:00
Antony Riakiotakis
59c71eb00a For gcc based systems use g++ for linking. This is necessary so that exceptions are propagated between shared libraries. We already use g++ when linking with cmake. 
This solves crash when trying to render with missing files on MinGW-w64 cycles. The cause was an OpenEXR exception that went uncaught when trying to check the file's extension through OpenImageIO while building the shader tree. Thus my bug-hunting frustration can end with a happy chord.
 2012-08-21 21:01:07 +00:00
Thomas Dinges
94ce9505a9 Legacy Compositor / Scons: 
* Added WITH_BF_COMPOSITOR_LEGACY, enabled per default.
 2012-08-20 20:13:37 +00:00
Daniel Genrich
23a299788d Fix El Topo compile with scons (win32 + linux - both untested) 2012-08-12 01:47:14 +00:00
Daniel Genrich
1aaaf67a9e Fix El Topo compile with scons (only win64 so far) 2012-08-12 00:19:55 +00:00
Sergey Sharybin
1a5998bc4e Remove old boolean operation module 
Carve proved it's a way to go, so the time have came to get rid of old
boolean operation module which isn't used anymore.

Still kept BOP interface but move it to BSP module. At some point it
could be cleaned up further (like perhaps removed extra abstraction
level or so) but would be nice to combine such a refactor with making
BSP aware of NGons.

Tested on linux using both cmake and scons, possible regressions on
windows/osx. Would check windoes build just after commit.
 2012-08-02 16:42:30 +00:00
Sergey Sharybin
990466e87e Initial support for numpy in scons 
Assumes numpy is installed to the BF_PYTHON/site-packages/numpy directory,
could be tweaked further, but this should be enough to setup release
building environment.

Seems blender can't import numpy, but that doesn't seem to be scons issue,
the same happens here with cmake too. Would ask Campbell to help looking
into this.
 2012-07-27 16:01:33 +00:00
Jens Verwiebe
53a861b6f9 OSX/scons: fix compiling on the new OSX 10.8 (Mountain Lion) with delivered Xcode 4.4 2012-07-26 11:08:56 +00:00
Antony Riakiotakis
fa92f2fb55 Update build systems to copy needed dlls from MinGW-w64, turn openmp on by default for MinGW. 2012-07-05 11:39:11 +00:00
Thomas Dinges
273f56ace0 Scons: 
* WITH_BF_COMPOSITOR option, to disable tile compositor compilation.
* Removed unused SCons file.
 2012-06-30 22:44:36 +00:00
Thomas Dinges
91de70a788 Cycles / Boost: 
* Windows (msvc 2008) is now using Boost 1.49
 2012-06-30 18:20:14 +00:00
Antony Riakiotakis
84c0aee254 Correct openjpeg for scons too. 2012-06-21 14:49:10 +00:00
Thomas Dinges
b1e8063d69 Cycles / CUDA: 
* Windows department switches to CUDA Toolkit 4.2 :)
* Windows Buildbot uses that too now (thanks jesterKing) 
* Re-enable sm_13 for x86, compiled again with current SVN and the new toolkit. 

* All official builds for windows now come with sm_13, sm_20, sm_21 and sm_30 for the Kepler cards.
 2012-05-29 12:28:34 +00:00
Thomas Dinges
04c30c5efb Scons / MSVC - Windows x64 
* SSE/SSE2 is an unknown option for the compiler (Command line warning D9002 : ignoring unknown option '/arch:SSE2'), so it can be left out because on x64 it automatically builds with SSE and SSE2.
 2012-05-28 09:20:04 +00:00
Joshua Leung
795edb74fa scons - Added option to not remove and unpack python modules bundle every 
compile
 2012-05-23 03:49:42 +00:00
Antony Riakiotakis
1937f3b8de Disable building of CUDA 1.3 kernels for cycles for win32 cmake and mingw32 scons. They were already disabled for scons MSVC 32bit. 2012-05-22 12:30:37 +00:00
Antony Riakiotakis
232980eef0 Cleanup optimization compile flags for mingw-w64. 
After testing it seems that for safe debug sessions, debug build optimizations need to be off. 

Also removed sse flags from release flags since they are included in ray optimization flags which are on by default.
 2012-05-14 23:36:07 +00:00
Antony Riakiotakis
e5963aae1d Change the scons configuration for MinGW-w64 to be more in-line with cmake. Also deactivate openmp as it causes crashes when rendering with subsurf or multires modifiers 2012-05-13 17:26:07 +00:00
Nathan Letwory
a88f910b9a Disable sm_13 CUDA kernel building for now, as the build fails with out of memory. 2012-05-12 22:00:32 +00:00
Nathan Letwory
63690b6b45 Enable setting of CUDA kernels to compile on command-line: 
python scons/scons.py BF_CYCLES_CUDA_BINARIES_ARCH=sm_20,sm21
 2012-05-12 21:37:01 +00:00
Nathan Letwory
e8e1a7cb9e Enable OpenCOLLADA support for MingW64 builds by default. 
Note: don't forget to update your local checkout of lib/mingw64
 2012-05-11 17:29:55 +00:00
Antony Riakiotakis
f91fa9d2ce Enable ffmpeg building with MinGW-w64. The libraries were compiled with gcc 4.7, however is has been claimed there are issues with gcc > 4.4 so this is for testing purposes. Still it doesn't crash on startup anymore. Forgot to mention on ffmpeg lib commit that committed ffmpeg version is 0.10.2 2012-05-10 11:37:41 +00:00
Brecht Van Lommel
ad929044d3 Fix: recent commit setting python3.2 command should not be applied to this file 
scons build scripts are still using python2.
 2012-05-02 09:03:04 +00:00
Campbell Barton
c6051ea87b replace python3 command with python3.2, python3 isnt available on ubuntu. 2012-05-01 20:45:16 +00:00
Thomas Dinges
e08a46c070 Windows / Scons: 
* Disable CUDA kernel compile per default, so people who don't use it can compile file with the default config.
 2012-04-30 09:06:19 +00:00
Nathan Letwory
fd2439f47a bump commit count, mingw32 -> mingw64 2012-04-28 08:47:37 +00:00
Nathan Letwory
5d70a6aedf Add MingW as "platform" 2012-04-28 08:45:55 +00:00
Antony Riakiotakis
7ac4bd9105 Enable building of the installer with MinGW-w64, patch by Caleb Joseph (Dobz) thanks a lot! 2012-04-25 11:15:55 +00:00
Antony Riakiotakis
75addcf233 Lower optimization settings for MinGW-w64. Full optimization causes artifacts with empties and gods know what else. Turned on -ftree-vectorize to match MSVC behaviour for 64bit. 2012-04-24 17:20:51 +00:00
Antony Riakiotakis
4e6590067d revert 45924, not a very clean solution, especially for external libraries and looks like -fpermissive is used in linux too 2012-04-24 16:14:23 +00:00
Antony Riakiotakis
0db3c5f743 Remove mingw-w64 errors from loss of precision by converting 64bit pointers to ints. All cases found were harmless and the error behaviour could be turned off by the -fpermissive flag but I'd rather keep that off to detect any real problems should they arise. 2012-04-24 14:33:44 +00:00
Antony Riakiotakis
4782522379 Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with slight modifications. 
Thanks!
 2012-04-24 12:57:58 +00:00
Antony Riakiotakis
c498c0eb42 Update build files to use the new lib locations for MinGW. For builders: you will need to checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/mingw32/ 
to build with MinGW past this commit.
 2012-04-23 01:11:42 +00:00
Thomas Dinges
f725a3d6c4 Scons ToDo: 
* Made Frameserver building optional, added WITH_BF_FRAMESERVER.
* Enabled per default in btools.py
 2012-04-14 22:19:29 +00:00
Thomas Dinges
48ed63b1a5 Scons ToDo: 
* Made Smoke building optional, added WITH_BF_SMOKE.
* Enabled per default in btools.py
 2012-04-14 21:55:38 +00:00
Thomas Dinges
d7221fd7c9 Scons / Windows release build configs: 
* Enable CUDA per default, only thing the builder has to do for release libs, is to specify BF_CYCLES_CUDA_NVCC.
 2012-04-12 13:58:16 +00:00
Thomas Dinges
3d4a14149b Scons: 
* Some code and comment cleanup
* Remove cmake equivalent variable comments
* Remove some non used parameters from config files and btools: WITH_BF_FMOD, BF_VERSION.
* Remove some commented non-used variables
 2012-04-07 18:26:54 +00:00
Thomas Dinges
3d893a926e Windows x64 / Scons: 
* Enable WITH_BF_OPENJPEG per default, it was enabled for 32 bit systems, why not on x64? 
* This brings back JPEG 2000 support for win x64.
 2012-04-06 10:57:22 +00:00