Commit Graph

347 Commits

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