Commit Graph

471 Commits

Author SHA1 Message Date
Sergey Sharybin
8b0e9a63e9 SCons: install blender thumbnailer next to blender binary.
Cmake already does this, and this will solve
2013-02-13 08:55:03 +00:00
Sergey Sharybin
a9cebb2555 SCons: no need to do data-to-c when building cudakernels only 2013-02-12 11:44:02 +00:00
Tamito Kajiyama
ac9ec06ec1 Merged changes in the trunk up to revision 54421.
Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/properties_render.py
source/blender/SConscript
source/blender/blenloader/intern/readfile.c
2013-02-10 10:17:59 +00:00
Ton Roosendaal
134c656878 New matcap collection for default in release. It's now 24 images, ordered
from regular diffuse to more shiny, stone, wax, eflective, glass and two non-realistic ones.

The menu now shows it in 3 rows. I made the previews a bit smaller, 96 pixels,
like the brushes for painting. 

Thanks everyone for submitting pics! I updated the credit file too, but name
from one person is missing still, will be added next.
2013-02-05 16:16:07 +00:00
Tamito Kajiyama
fe26492538 Merged changes in the trunk up to revision 54171. 2013-01-29 03:42:19 +00:00
Thomas Dinges
8042ecba96 Scons:
* Fix for new cycles_preview.blend
2013-01-28 17:49:15 +00:00
Tamito Kajiyama
556912792a Merged changes in the trunk up to revision 54110.
Conflicts resolved:
source/blender/blenfont/SConscript
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_scene.c
2013-01-26 23:49:13 +00:00
Antony Riakiotakis
f758c7bd25 revert scons fix, it is necessary after all 2013-01-22 14:25:20 +00:00
Antony Riakiotakis
598d84efed ubuntu 12.10 does not have pyconfig.h in include directory causing scons to fail. Omitting since it looks like cmake only uses Python.h too 2013-01-22 14:14:30 +00:00
Joshua Leung
7fe1e9d204 scons compile fix for Ton's matcaps work 2013-01-22 11:37:12 +00:00
Tamito Kajiyama
94ae0232b0 Merged changes in the trunk up to revision 53729.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c
2013-01-12 02:02:53 +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
Tamito Kajiyama
feccbaabbd Merged changes in the trunk up to revision 53584.
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h

Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup
2013-01-05 22:24:05 +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
c04631f0bb patch [#33669] SConstruct: Tell how to pass BF_PYTHON_INC to SCons is it is not found
from anatoly techtonik (techtonik)
2012-12-28 12:12:04 +00:00
Tamito Kajiyama
a462d69bbf Another big patch set by Bastien Montagne, thanks a lot!
* Made Freestyle optional (turned on by default).

* Fix for missing bpath.c updates in the previous merge of trunk changes.
2012-12-20 07:57:26 +00:00
Ton Roosendaal
8168fba972 Icons now draw good again!
- Exported via Inkscape a 16 and 32 pixel bitmap version
- Use these as mipmap levels for OpenGL texture drawing.
- Changed code to get right sizes for drawing icons - better than last week's method.

Todo:

- Custom icons don't work yet (old one)
- Missing icons in the svg
- The .sh script for inkscape needs changed to support this
  (now do manual saving)
2012-12-18 19:35:54 +00:00
Bastien Montagne
ab2c273b12 Added GPL header to sconscripts!
Also changed shebang to '#!/usr/bin/env python', this is more portable across unixes...
2012-12-17 08:01:43 +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
Jens Verwiebe
1fa12f09d5 OSX/scons: introducing and testing an unexported_symbols_list to prevent clashes, todo: cmake 2012-11-27 11:38:59 +00:00
Jens Verwiebe
efe012eeac OSX/scons/osl: un-hardcode the osl libpath 2012-11-19 17:15:33 +00:00
Jens Verwiebe
3cf8dd5296 OSX/scons: little cleanup to BF_PROGRAM_LINKFLAGS 2012-11-17 12:09:50 +00:00
Campbell Barton
38eee0104b quiet scons deprecation warnings and correct --with_filesystem --> --with-filesystem in install_deps.sh 2012-11-17 05:16:54 +00:00
Jens Verwiebe
7494698031 OSX/scons/osl: use Xlinker for the BF_PROGRAM_LINKFLAGS, so we can alternative again compile with gcc-4.6 2012-11-16 15:18:14 +00:00
Jens Verwiebe
d017f34c5d OSX/scons/osl: working but not optimally designed atm 2012-11-16 14:42:04 +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
Thomas Dinges
17e506a83e Windows OIIO:
* bin/OpenImageIO.dll not needed anymore, now statically linked.
2012-11-15 19:37:29 +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
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
e811a2d0ff Fix to allow several include dirs for python under scons build system (needed with new py3.3 debian-like packages). 2012-11-12 18:31:15 +00:00
Thomas Dinges
31fd769641 * Remove one last "gnu_gettext.dll" reference in scons. 2012-11-11 19:53:12 +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
aa1e50be94 add option to build without blenders default avi codec. 2012-10-08 02:51:42 +00:00
Antony Riakiotakis
237a9fde92 Enable OpenColorIO for MinGW64 build targets 2012-09-16 18:05:32 +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
Campbell Barton
ca7c07cda9 add back datatoc, use this instead of cmake script which was too slow. 2012-08-11 16:25:31 +00:00
Campbell Barton
b97fc46abc remove all remaining data files from source, now all are converted at build time.
note: this is currently very slow in cmake, will address this next.
2012-08-11 15:24:31 +00:00
Campbell Barton
90f443bb86 generate brush icons C files at build time. 2012-08-11 14:40:09 +00:00
Campbell Barton
81272e28a0 generate glsl shaders c files at build time. 2012-08-11 13:01:44 +00:00
Campbell Barton
5f341a846b startup.blend and preview.blend are now converted to C at build time.
made some changes to startup.c
- change default player to internal since its working now.
- added new screen for full screen 3d viewport (nice for demo's and navigating)
- disable cursor depth option (was enabled by default because of re-used flag)
2012-08-11 12:26:43 +00:00
Campbell Barton
24ac1ce44e fix own error with scons, building failed when BF_BUILDDIR was absolute. 2012-08-10 15:25:54 +00:00
Campbell Barton
414b9865e4 zero rotation values for quat_apply_track() which were in fact just float in precision.
also minor code cleanup - tabs -> spaces in scons file.
2012-08-10 08:19:45 +00:00
Campbell Barton
7a760b4804 generate COM_OpenCLKernels.cl.h automatically at build time, this allows editing COM_OpenCLKernels.cl and rebuilding and means we dont have to have both files in svn.
updates made to cmake and scons.
2012-08-09 19:59:36 +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
aa29ae6b4f Fix ultra stupid mistake on Scons. 2012-07-06 13:36:54 +00:00
Thomas Dinges
b0644f0b05 Scons:
Fix for r48639, wrong syntax and wrong indent...
2012-07-05 11:45:28 +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
Campbell Barton
54156e2b82 option to disable feather, since its so slow - for interactively editing masks its useful to be able to disable.
also rename RNA to 'use_antialiasing'
2012-06-21 12:27:57 +00:00
Thomas Dinges
7a301579c8 Scons:
* Remove "plugininstall" from argument list, caused errors.
2012-05-29 12:13:45 +00:00
Campbell Barton
0b7593a3dc finish cleanup for plugins 2012-05-29 10:31:42 +00:00
Joshua Leung
523a6b0424 Scons - only go to the trouble of making these directories if they don't already
exist!
2012-05-23 04:15:50 +00:00
Antony Riakiotakis
e54a0039dc Add pthread dll for MinGW64 during installation. Now people who download from buildbot will be able to run the build even without MinGW-w64 installed. 2012-05-01 20:57:39 +00:00
Nathan Letwory
c30dba9a92 Fix OIIO dll copying for win32-mingw 2012-04-26 08:04:11 +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
Thomas Dinges
3f605bff4b Scons:
* Add new scons options to 'blenderlite' target

* Remove ancient yafray comment
2012-04-14 22:33:48 +00:00
Campbell Barton
17786b3b3e building without python works again, cleanup bmesh include paths (cmake and scons). 2012-03-08 03:25:53 +00:00
Jens Verwiebe
f8d55b5bf0 OSX: scons: fix own mistake, truncate output of xcode-build -version to major.minor version in config to change the var not only the print 2012-02-25 11:21:20 +00:00
Jens Verwiebe
bbb77f5878 OSX: scons: corrected output string of xcode-build -version, so only major/minor version is used 2012-02-25 10:59:32 +00:00
Sergey Sharybin
29f0ff718b Reverting changes made to build systems when was upgrading OpenAL.
Reverting to openal from creative because own builds doesn't deal with 3D sound.
Hopefully it wouldn't lead to crashes caused by ffmpeg+openal (for resolving which
libraries were updated to openal-soft).
2012-02-17 16:58:34 +00:00
Sergey Sharybin
7a85ad51bf Compilation error when using mingw+scons
Error was caused by boost library (which doesn't seem to be working with Cycles too
when compiling with mingw). Switched mingw to use TR1 unordered collections. Also,
there was re-declaration of strcasecmp when mingw is used.

Additional changes are related on using own process spawning when BF_TOOLSET is set to
mingw. Seems to be working fine now (i've got too long command line error) and no
warning are supressing now (as it was told in comment for commented own process spawning).
2012-01-17 10:32:17 +00:00
Campbell Barton
ba8d1b940f option to build without remesh modifier for cmake and scons 2011-12-31 03:34:44 +00:00
Sergey Sharybin
a0e62e77d7 Update build files to use new OpenAL libraries 2011-12-27 09:37:19 +00:00
Thomas Dinges
b66c87231a * Changes for static win32 png libs. 2011-12-19 19:46:07 +00:00
Jens Verwiebe
94bc2b0cff OSX: proper scons config and linking weak for jackOSX and errorhandling 2011-12-12 22:17:02 +00:00
Thomas Dinges
7c630aac80 Scons/CUDA
* Added missing bitness info to the nvcc_flags. 
This makes sure that the nvcc compiler builds the correct cubins.
2011-12-08 19:16:43 +00:00
Brecht Van Lommel
45de380771 Cycles
* Compile all of cycles with -ffast-math again
* Add scons compilation of cuda binaries, tested on mac/linux.
* Add UI option for supported/experimental features, to make it
  more clear what is supported, opencl/subdivision is experimental.
* Remove cycles xml exporter, was just for testing.
2011-12-01 16:33:21 +00:00
Campbell Barton
8c6057d5e3 exclude addons_contrib/ for release builds. 2011-11-17 19:43:59 +00:00
Jens Verwiebe
8cf563530d Scons: make sure fftw is enabled when ocean_mod is compiled 2011-11-14 12:55:46 +00:00
Lukas Toenne
11c83d8432 Ocean Sim modifier patch
by Matt Ebb, Hamed Zaghaghi

This adds a new Modifier "Ocean" to simulate large-scale wave motion.
Details can be found in the wiki documentation [1], the project homepage [2] and the patch tracker [3]

The modifier is disabled by default for now. To enable it, the WITH_OCEANSIM (cmake) / WITH_BF_OCEANSIM (scons) flags have to be set. The code depends on fftw3, so this also has to be enabled.

[1]
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Ocean

[2]
http://www.savetheoceansim.com

[3]
http://projects.blender.org/tracker/?group_id=9&atid=127&func=detail&aid=28338
2011-11-13 12:17:27 +00:00
Joshua Leung
9111213a98 Whitespace tweaks 2011-11-10 10:34:26 +00:00
Nathan Letwory
c9bca51e76 Add compiles support for Cycles.
No CUDA compiling yet, will be added later.
2011-11-08 20:40:02 +00:00
Thomas Dinges
f837b46a2b Modifier compilation tweaks (Blender conference commit)
* Fluid compilation: Inverse the compile flag from DISABLE_ELBEEM to WITH_MOD_FLUID for consistency. (scons/cmake)
* Use WITH_BF_FLUID in your user config (scons) 

* Add support for scons to disable build with Decimate and Boolean modifier. 
(WITH_BF_DECIMATE and WITH_BF_BOOLEAN)
2011-10-29 23:56:07 +00:00
Bastien Montagne
c49cdf5eec Another set of UI messages fixes and tweaks! No functional changes. 2011-10-23 19:54:06 +00:00
Guillermo S. Romero
6105199668 Remove the svn:keywords property. 2011-10-23 18:38:16 +00:00
Campbell Barton
4a04f72069 remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
Campbell Barton
d37760bc34 cleanup scons build flags, many duplicates because because of confusion between CFLAGS/CPPFLAGS/CCFLAGS/CXXFLAGS, devs would set multiple to be on the safe side.
- defines go in CPPFLAGS
- C & C++ flags go in CCFLAGS
- CFLAGS / CXXFLAGS are C OR C++ only.

also commented intended ghost unicode/ascii usage.
2011-10-21 04:23:26 +00:00
Campbell Barton
78a8f8a4b1 - remove release/bin/.blender/.bfont.ttf, we have ./release/datafiles/bfont.ttf already, and its not used anymore.
- removed scons WITH_BF_FREETYPE
2011-10-21 03:16:01 +00:00
Campbell Barton
d132b08f33 move fonts/ and locale/ dirs into release/datafiles, since blender wasn't finding them in their current location and so to test international characters you had to 'make install'.
updated scons/cmake/translation-scripts.
2011-10-21 03:00:28 +00:00
Campbell Barton
427f770d64 scons flags were being set carelessly - CCFLAGS is like setting CFLAGS and CXXFLAGS - in a few cases this was being set redundantly.
there are more cases that chould be changed since CPPFLAGS and CCFLAGS are both being set where only one is needed but for now this is safe.
2011-10-05 23:35:03 +00:00
Campbell Barton
bfe27327a0 revert part of r40800, btools.ENDIAN should be correct, if its not then that needs to be fixed rather then checking on the platform.
./build_files/scons/tools/btools.py:68 - checkEndian() uses pythons struct which knows the systems native endian and will work unless cross compiling (which afaik isnt dont between different endian systems so far).
2011-10-05 23:17:40 +00:00
Jens Verwiebe
39300a5079 OSX: Correct copy/paste error and exclude endianess switch from darwin 2011-10-05 08:58:32 +00:00
Campbell Barton
e42146c1ec remove .Blanguages, its not used anymore 2011-10-02 22:28:49 +00:00
Jens Verwiebe
d0e7be242b OSX: solve weaklinking for non-apple compilers by using Xlinker, build also QTKit with apple gcc, to be more compatible to distributed gnu-gcc compilers without objC, objC++ capabilities 2011-09-28 11:56:50 +00:00
Sergey Sharybin
f198961ebc Ignore .Blanguages and .bfont.ttf when installing.
This files aren't used by blender anymore but they leads to
portable install when using scons.
2011-09-20 14:41:01 +00:00
Sergey Sharybin
2015eefef7 i18n: some fixes for windows, scons and game engine 2011-09-20 09:32:14 +00:00
Sergey Sharybin
fed2994697 i18n: fixes for scons datafiles installation pathes 2011-09-19 11:45:44 +00:00
Sergey Sharybin
1c0bdad835 svn merge -r40222:40344 ^/trunk/blender 2011-09-19 10:48:15 +00:00
Campbell Barton
83a2f02a78 cleanup endian handling
- define __BIG_ENDIAN__ or __LITTLE_ENDIAN__ with cmake & scons.
- ENDIAN_ORDER is now a define rather than a global short.
- replace checks like this with single ifdef: #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
- remove BKE_endian.h which isn't used
2011-09-19 08:02:17 +00:00
Sergey Sharybin
30293dc2ca svn merge -r39834:40222 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-15 13:02:37 +00:00
Sergey Sharybin
86d05b3144 Update build rules to deal with new gettext libraries. 2011-09-15 11:37:42 +00:00
Xiao Xiangquan
981f7fcd0d merge with trunk r39834 2011-09-01 15:08:32 +00:00
Nathan Letwory
241dc35f0e Fix locale+font copy.
Wrong dir was being walked, causing the locales and font to not be copied.
2011-08-29 06:28:09 +00:00
Jens Verwiebe
b44a82f3c4 ups, syntax error, missing : 2011-08-25 15:18:54 +00:00
Jens Verwiebe
d833d15608 OSX: refine logic for NDOF, if WITH_BF_3DMOUSE is disabled also never do weak-link framework, existing or not 2011-08-25 15:12:57 +00:00
Jens Verwiebe
8b6dfade4d OSX: fix condition for NDOF linking 2011-08-25 14:49:47 +00:00
Jens Verwiebe
826614d66e name mandatory driver for OSX NDOF compile - testcommit same time 2011-08-21 21:11:26 +00:00
Sergey Sharybin
36f20f162c Fix #28154: linux3-config.py doesn't exist
Change OURPLATFORM from "linux<major_version>" to simple "linux".
Since new policy for linux kernel versions that major version in
platform doesn't make much sense for building rules so the same
rules could be used for both of linux2 and linux3 now/

Tested on both of linux2 and linux3 systems.
2011-08-21 13:31:46 +00:00