bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
48,361 Commits 2 Branches 0 Tags 745 MiB
00234dab2f
Commit Graph

431 Commits

Author SHA1 Message Date
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
Xiao Xiangquan
3a8c7be9e4 code clear, insert blf_gettext.c to blf.c 2011-08-12 13:43:21 +00:00
Xiao Xiangquan
b99f7af357 remove gettext from mkaesrna, and update language packs 2011-08-11 22:14:07 +00:00
Sergey Sharybin
c9216e390c Commiting patch from jensverwiebe for NDOF support on OSX 2011-08-11 15:59:19 +00:00
Xiao Xiangquan
465c3b82fa merge with trunk r39216 2011-08-10 14:32:03 +00:00
Thomas Dinges
fad243a4bf Mac Compile fix for ndof, by jensverwiebe. Thanks! 2011-08-07 22:48:04 +00:00
Campbell Barton
577293569a scons patch from jensverwiebe 
fix a silly bug in version detection, - added an OSX sdk-check

jensverwiebe, needs to get commit access!, but will apply his patches for now.
 2011-08-07 16:54:40 +00:00
Mike Erwin
6a0bbfd0e4 fixed ndof library detect for Mac SCons, ndof enabled by default (disabled if lib not found), minor cleanup 2011-08-07 16:29:05 +00:00
Campbell Barton
af786843b0 patch from jensverwiebe to disable ndof if header is not found. 2011-08-04 08:46:17 +00:00
Sergey Sharybin
2c4357c1e1 - Move list of FFmpeg DLLs to be installed from SConstruct 
to conficuration variable BF_FFMPEG_DDL.
  This would allow to use different FFmpeg in buildbot.
- Added some 3DMOUSE variables to list of command line options.
  Now 3dmouse related-settings can be set from command line.
 2011-08-03 10:50:21 +00:00
Nathan Letwory
5c36b75324 Simple argument to be able to explicitely tell the bitness you want to build Blender in. 
python scons\scons.py BF_BITNESS=32
python scons\scons.py BF_BITNESS=64

So from now on for Windows you don't have to run a specific win32 or win64 Python version
to get the Blender version you want. If you omit the BF_BITNESS flag the bitness as per
Python version will be used as before.

Note that this is an argument, so works *only* on the command-line, not in your user-config.py
 2011-08-02 18:33:39 +00:00
Jiri Hnidek
2e860a3e85 - Blender could be build with scons again. 2011-08-02 07:02:40 +00:00
Xiao Xiangquan
287b24926f merge with trunk r38787 2011-07-29 17:42:53 +00:00
Xiao Xiangquan
575b7c0bd3 update make install rule for scons to support i18n 2011-07-28 13:32:27 +00:00
Campbell Barton
2d8c1e60e6 print an error message if Python.h can't be found for cmake and scons since its such a common problem. 2011-07-16 06:55:45 +00:00
Campbell Barton
2023db70a8 cmake option to build without an audio library. 2011-06-23 09:27:56 +00:00
Nathan Letwory
899f2776db Shuffle some build code around to ensure debug builds on Windows actually run too. 
* creator/SConscript is now empty, code is moved to an emitter function in Blender.py
* make sure COLLADA debug libs are used when BF_DEBUG=True
 2011-06-08 11:53:07 +00:00
Brecht Van Lommel
cb12337363 Code cleanup: remove source/kernel module, this wasn't really the kernel of 
anything, only contained a hash map and functions to pass command line args
to the game engine. Moved those to container and BlenderRoutines modules.
 2011-05-06 20:18:42 +00:00
Nathan Letwory
e4e78d4754 Apply [#26044] Windows thumbnails and improved filetype registration 
submitted by Tom Edwards
Fix [#25473] 64bit Windows installer for version 2.56 is not working
patch submitted by Caleb (Dobz)

The thumbnail patch adds a thumb handler DLL that adds .blend thumbnail support in Windows Explorer. A -r option is added to do registration in background. The patch also improves icon building and metadata for blender.exe.

Caleb fixes and cleans up our installer to an acceptable state. The patch uses the new -r option to do the .blend extension and thumbnailer registration.

Thanks to both Caleb and Tom for their efforts!
 2011-03-29 13:00:03 +00:00
Nathan Letwory
d2a721cfd5 Add buildslave target for builder.blender.org integration 2011-03-22 10:26:53 +00:00
Nathan Letwory
708df39935 Check the os.environ at the start of the build process. 
Print any variable that contains a value with non-ascii
characters, then abort build.
 2011-02-18 09:39:15 +00:00
Campbell Barton
711ba795f7 ignore __pycache__ dir for scons and cmake installation (py3.2 caches modules here). 2011-02-09 00:45:16 +00:00
Nathan Letwory
7c31042c6e And on your left you can see something much nicer (while I fix this here on your right). 2011-01-27 19:49:43 +00:00
Nathan Letwory
71cb745941 Commit to cope with API changes in OpenCOLLADA (latest for Windows right now r827). 2011-01-27 19:39:06 +00:00
Nathan Letwory
9924ade102 test commit for svn link in commit mail, part two 2011-01-17 10:47:31 +00:00
Nathan Letwory
637f4273aa test commit for svn link in commit mail 2011-01-17 10:43:51 +00:00
Nathan Letwory
6278cda106 Compiling and linking blenderplayer statically now works too. This brings it in line with blender linking line. 
Small patch by Sergey Sharybin
 2010-12-27 09:01:57 +00:00
Nathan Letwory
a8febab31b Workaround for blenderplayer not linking on linux with scons. 
Maybe as a next big, uncool project would be: solve bad level calls.
 2010-12-21 00:21:42 +00:00
Nathan Letwory
c0314f1041 Make sure plugins/ goes under shortversion/ dir 2010-10-26 22:13:37 +00:00
Nathan Letwory
bff1bef6bb Fix SCons for [#23833]. Ensure that empty dirs will exist too. 2010-09-15 14:50:14 +00:00
Nathan Letwory
6c113b54b3 Finally change SConscript tabs to spaces. 2010-08-29 20:52:05 +00:00
Nathan Letwory
92422ba452 Patch [#23389] Add authorship information to exported COLLADA files 
Contributed by Imran Syed (freakabcd).

This adds basic authoring tool and author info ("Blender User" for now).

NOTE: Linux and OSX users need now to update their OpenCOLLADA libs - Blender should now compile fine with their latest revision.

Made some changes to the original patch to ensure linking is done correctly.
Some small cleanups for scons too.
 2010-08-26 06:58:32 +00:00
Nathan Letwory
4fe2c63e6d Skip also SVN administration files that start with _ instead of . 2010-08-22 00:07:23 +00:00
Campbell Barton
957976882d build options to disable image formats WITH_CINEON, WITH_HDR. 
- updated cmake, make & scons.
- renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.
 2010-08-03 11:25:34 +00:00
Campbell Barton
ec2c52c9c8 SCons 
- remove scons option WITH_BF_FHS, its not needed anymore.
- comment WITH_BF_DOCS, was using epydocs which we dont use now.
- blenderlite target was broken, always using openmp.
- building without python wasnt working.

- fixed some warnings.
 2010-08-02 16:27:41 +00:00
Nathan Letwory
f054ecd37a libjack.dll not needed anymore 2010-07-19 10:15:49 +00:00
Sergey Sharybin
266438b5e0 - Use correct paths for mstoolkit and crossmingw tools in sconscript 
- Use _stat64i32 instead of _stat in BLI_exist
  Needed for correct compilation by mingw, no sense for msvc
  (_stat is equivalent to _stat64i32 in Visual C++ 2005, and later i suppose)
- Added library msvcr90 for mingw to solve linking error to _stat64i32
 2010-07-19 09:02:27 +00:00
Nathan Letwory
18c82ce390 Make SConstruct look in build_files/scons/tools and import from there, so no more 'import tools.Blender'. 
This fixes problem after change to this new location, but with .pyc files still lingering in old tools/
directory that still got imported due to syspath form.
 2010-07-14 16:38:09 +00:00
Campbell Barton
d80d6e2812 re-arrange build files so scons "config" dir isnt confused with ~/.blender/2.52/config 2010-07-12 18:26:35 +00:00
Nathan Letwory
1c35121213 == SCons == 
Updated to comply with datafiles filepath patch.

I've tried to do some changes for OSX too, but I'm not sure if they're correct,
so OSX people, please test and report.
 2010-07-05 07:06:19 +00:00
Andrea Weikert
ca81aa704e Patch [#22339] File/installation paths changes 
Patch Tracker: http://projects.blender.org/tracker/?func=detail&aid=22339&group_id=9&atid=127

This patch implements the proposal outlined here:
http://wiki.blender.org/index.php/Dev:2.5/Source/Installation/Proposal

Original patch by Matt Ebb.
Contributions by Nathan Letwory, Damien Plisson and Andrea Weikert

NOTE:
This is a work in progress commit, some work still needs to be done on the SCons and CMake files for this to work properly, but at least should compile and the files should be created in the right directory.

Commit discussed on IRC with Ton and Campbell.
 2010-07-04 15:35:23 +00:00