bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
54,011 Commits 2 Branches 0 Tags 745 MiB
ba88824f32
Commit Graph

426 Commits

Author SHA1 Message Date
Campbell Barton
ba88824f32 Remove unused scons config files 2014-05-08 14:16:26 +10:00
Thomas Dinges
d1009bdad5 Windows: Disable Numpy for now, we miss the libs for Python 3.4. 
Also make the flag WITH_BF_PYTHON_INSTALL_NUMPY flag actually work on Windows.
 2014-04-30 16:49:49 +02:00
Brecht Van Lommel
741f17f05b Cycles CUDA: make CUDA toolkit 6.0 the official supported version. 
This also updates the configurations to build kernels for compute capability
5.0 cards, when using and older CUDA toolkit version this will be skipped.

Also includes tweaks to improve performance with this version:
* Increase max registers on sm_30, sm_35 and sm_50
* No longer use texture storage on sm_30
 2014-04-30 16:07:27 +02:00
Campbell Barton
b96d531bc9 Python: move to version 3.4x on all platforms 2014-04-30 23:19:16 +10:00
Campbell Barton
417efb0e8b Remove hard coded Python version for scons 
note: this isn't best way of extracting version without '.'
 2014-04-30 22:29:28 +10:00
Jens Verwiebe
cddbe87ae5 OSX/python: update to py 3.4 2014-04-15 14:12:22 +02:00
Antony Riakiotakis
3ab0a4da73 Enable openmp in MinGW-w64 2014-04-07 19:01:19 +03:00
Jens Verwiebe
8ff74bed9b Scons/cycles: fix header distribution for geom 2014-04-04 13:07:32 +02:00
Antony Riakiotakis
cc439f683b fix scons ffmpeg libraries for mingw32 2014-03-30 01:35:39 +02:00
Sergey Sharybin
d3a73d0845 Windows: Upgrade FFmpeg from 0.10 to 2.1.4 
Fixes T39423: Blender crashes on iv41 encoded videos in thumbnail display mode

Libraries are still being committed to the svn, so compilation might be broken
for a while. Sorry for this, but can't really be avoided.

Also, some typos in scons are possible.
 2014-03-27 16:52:59 +06:00
Lukas Tönne
bbfcb0b1e4 Build file macro for testing unordered_map C++ container support. 
Using unordered_map and unordered_set C++ container types currently
requires careful testing or usage of boost, due to the various confusing
C++ version differences in include paths and namespaces.

Libmv defines tests for these cases in cmake and scons, such that ceres
can use any available implementation, or fall back too std::map/std::set
if none can be found.

This patch generalizes this buildfile code by providing a Blender macro.
* cmake: defines both the variables used by libmv at them moment as well
as 2 variables UNORDERED_MAP_INCLUDE_PREFIX and UNORDERED_MAP_NAMESPACE,
which can later be used in other C++ parts for convenience.
* scons: adds a tool script returning the include prefix and namespace.
Libmv checks these to define the appropriate definitions for ceres.

Differential Revision: https://developer.blender.org/D425
 2014-03-25 09:25:00 +01:00
Sergey Sharybin
43b5f0af2d tweaks to buildinfo 
We wouldn't really have release branches, building will happen
from annotated tags.

Made it so building tag revision equals to a master branch.
 2014-03-07 18:27:16 +06:00
Jens Verwiebe
4acff9d6f1 OSX/scons: according to last commit, , use the version variable 2014-03-04 21:08:49 +01:00
Campbell Barton
5d74cac463 Build system: option to copy 'requests' from scons. 2014-03-05 06:43:47 +11:00
Jens Verwiebe
976fd68082 OSX/scons: copy release/site-packages for OSX ( static py for now ) 2014-03-04 18:41:19 +01:00
Campbell Barton
add6384213 Build system: use lstrip with scons 2014-03-05 04:19:55 +11:00
Campbell Barton
2c4c4a56b8 Build system copy release/site-packages for windows 2014-03-05 04:13:35 +11:00
Campbell Barton
c436c78de1 Build system support for numpy on ms-windows 2014-03-05 00:22:51 +11:00
Campbell Barton
13290d5a16 Scons: remove lcms reference 2014-03-04 12:42:17 +11:00
Martijn Berger
4903544cad On MSVC 2013 64 bit set the default to build a vista API targetted binary. 2014-02-24 23:14:12 +01:00
Jens Verwiebe
9e924c8ffe OSX/scons: cp needs the targetdir to be created ( ditto does it itself ), 
changing the order of commands let us use cp again
 2014-02-24 12:09:55 +01:00
Jens Verwiebe
056d86ec83 OSX/scons: Fix language menu not showing up in prefs: 
The languages file was not installed to locale due it has
no extension, using ditto now
 2014-02-23 23:17:30 +01:00
Sergey Sharybin
28f3cc3eb7 Fixes for buildinfo hash/branch detection 
Branch name and hash didn't work properly when having disconnected
HEAD or when having current HEAD below upstream.
 2014-02-20 21:43:30 +06:00
Campbell Barton
a6b87853cb MSVC: add more warnings to match OSX/Linux 2014-02-19 18:05:37 +11:00
Campbell Barton
d76bcf98a3 MSVC: improve warnings for scons and cmake 
Some int/float conversion warnings were disabled by buildsystems but
re-enabled by BLI_winstuff.h, the warnigns relate to conversions not
considered issues on other systems so better just quiet them.
 2014-02-19 17:37:02 +11:00
Martijn Berger
ace071f99e prepare 32bit build msvc2013 scons/buildbot 2014-02-18 23:15:40 +01:00
Jens Verwiebe
c987bcc416 OSX: more futurework for clang-openmp: 
- moved assumed location of omp lib to blender libs
- prepared libiomp5 to link out of the box with cmake
- changed according in scons
- introduced a local var C_VENDOR, cause Apple clang 3.4 may not include omp support yet
- added a linklibs for msgfmt ( may not be needed for other than OSX )
 2014-02-18 17:18:35 +01:00
Martijn Berger
727ef0dfde win32 MSVC 2013 add scons support 2014-02-13 19:15:43 +01:00
Jens Verwiebe
a84bcea070 OSX/scons: allow for compiling with clang-openmp-3.4 
See: http://clang-omp.github.io
+ fix a longstanding bad include in darwin-config
 2014-02-09 18:03:13 +01:00
Lawrence D'Oliveiro
cb0a5adc56 SCons: cleaner determination of 32-bit/64-bit builds 
Try not to be x86-centric, remove unneeded blenderdeps variable.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D240
 2014-02-04 19:01:10 +01:00
Lawrence D'Oliveiro
eeefbbcc78 SCons: Simplify Endian determination 
Differential Revision: https://developer.blender.org/D252
 2014-01-31 13:20:26 +01:00
Jens Verwiebe
74ae93d1cd Scons: Fix cycles OpenCL kernelcompile by distributing util_half.h 2014-01-17 00:33:32 +01:00
Thomas Dinges
5d88f7c7db Cycles: Build SSE41 kernel per default, remove build option. This hopefully also fixes some compile errors on various systems. 2014-01-14 22:04:32 +01:00
Martijn Berger
62c8bae872 Added scons option to actually build the sse41 kernel. CMake already has it 2014-01-06 21:38:56 +01:00
Martijn Berger
cb4d32cba3 one more msvc 2013 change 2013-12-30 22:25:56 +01:00
Martijn Berger
21d587d9fc Added option to have a seperate environment for executing nvcc 
This can be used to compiler cuda kernels with Visual Studio 2010 while
the rest of blender is compiled with MSVC 12.0 / 2013
 2013-12-29 14:57:21 +01:00
Martijn Berger
42044a96e4 Basic scons support for building with Visual Studio 2013 although full MSVC 2013 support still needs more work in scons itself 2013-12-27 19:46:55 +01:00
Jens Verwiebe
901ebbd94a Scons: as requested by Ideasman, make MACOSX_COMPILER -> C_COMPILER_ID, 
leave env set for OSX exclusive for now”
 2013-12-08 15:35:21 +01:00
Jens Verwiebe
c167d7b79a OSX/scons: Introduce a new env var 'MACOSX_COMPILER' 
This is needed to resolve the real used compiler from the compatibility shim’S or symlinks.
Also set the real CCVERSION as scons CCVERSION would only read the default one, which
is not useful for OSX
 2013-12-06 17:06:51 +01:00
Jens Verwiebe
df2f604af2 OSX/scons: fix misdesigned version detection of compiler ( todo: do with submodule ), fix a compiler warning with clang < 5” 2013-12-04 23:15:29 +01:00
Sergey Sharybin
6a6c7b10de Correction to previous commit 
Better just use "strip", to be sure \r\n is also stripped.
This also corresponds to what happens with popen() results.
 2013-11-29 22:41:01 +06:00
Jens Verwiebe
f359b931f9 Better removal of \n in hash with rstrip 2013-11-29 17:27:29 +01:00
Jens Verwiebe
3bf77c34eb Fix scons compile after last commit ( unwanted new line ) 2013-11-29 17:04:29 +01:00
Sergey Sharybin
5f2400414a Buildinfo: suppress error prints when building local branches 
Before this console output contained messages about branch is not
configured to use any upstream branch which is not useful information
at all.
 2013-11-29 18:44:45 +06:00
Brecht Van Lommel
683093b5c8 CMake/Scons Build: disable explicit linking to libstdc++ on Linux/Unix. 
It's not needed, this should happen automatically already, and if you build
against libc++ instead (as on recent FreeBSD), this would give build errors.

Ref T37477.
 2013-11-28 18:07:57 +01:00
Sergey Sharybin
764204baf2 Remove debug prints from SCons' python module 
Seems to be left by accident in rB9a79e03752509997e99094763f9183e6e5ce3637

If not, please do prints more verbose :)
 2013-11-28 19:46:23 +06:00
Sergey Sharybin
af7a2a3b6a Fix buildinfo hash for cases there's no upstream set for the branch 2013-11-28 02:25:09 +06:00
Sergey Sharybin
551f3eef74 Show hash from latest pushed commit in buildinfo 
Before this hash of latest local commit was used,
which is not so much useful since nobody can access
that commit hash.
 2013-11-25 16:25:35 +06:00
Sergey Sharybin
50fbebe0a4 Buildinfo fixes 
- Use -M suffix if working tree does have uncommitted
  modifications.
- Local commits are considered local changes as well
 2013-11-19 22:22:21 +06:00
Sergey Sharybin
46684d1ad2 Initial tweaks to buildbot configuration 
Pretty much sure more tweaks would be needed,
but need this to get started.
 2013-11-19 15:01:00 +06:00