archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
36,617 Commits 660 Branches 0 Tags
79f9964cdb99d44dc41785d37a9712ad97b51d4d
Commit Graph

362 Commits

Author SHA1 Message Date
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
gsr b3d
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