Commit Graph

205 Commits

Author SHA1 Message Date
Brecht Van Lommel
b3c238e8bc 2.5: merge with trunk, previous merge was only up to yesterday.
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD
2008-11-12 22:03:11 +00:00
Nathan Letwory
418ee26c0e spaces -> tabs 2008-11-11 20:47:45 +00:00
Campbell Barton
483136c8e4 Adjusted scons files so disabling quicktime, python and sdl also removes their includes when building.
writefile.c had usless include.
2008-11-11 14:14:22 +00:00
Nathan Letwory
76320b76ad Change remaining Copy() to Clone() 2008-11-05 23:23:04 +00:00
Nathan Letwory
0bd7934be7 * Minimum SCons version is now 1.0.0
- Code has been changed to reflect this (ie. deprecated functions are not anymore used)
* clean up the C and C++ compiler flags mess.
  - in the environment construction of BlenderLib all the compile flag governing options have been split in the *C*, *CC* and *CXX* containing equivalents.
    C is for C compiler only flags. CC is for C and C++ compiler flags and CXX is for C++ compiler only flags.
    All the platform default config files need to be double checked and fixed wherever it looks necessary. Either DIY, or send me a note with needed changes.
  - a start for the BlenderLib parameter list has been made - all the SConscripts need to be checked and modified to hand in flags properly.
* A theeth request: make -jN settable in the config file.
  - I give you BF_NUMJOBS, which is set to 1 by default. In your user-config.py, set BF_NUMJOBS=4 to have 4 parallel jobs handled. Yay.
2008-10-30 23:55:07 +00:00
Campbell Barton
ac4ff83ca6 added scons option BF_WITH_PYTHON (defined as DISABLE_PYTHON) 2008-10-28 18:47:13 +00:00
Campbell Barton
bc55102eac renamed WITH_BF_BPYDOC to WITH_BF_DOCS, added SConscript for building BGE docs too. 2008-10-20 23:21:01 +00:00
Nathan Letwory
f1f27c0350 === SCons ===
[#17867] Adds option to SCONS to generate Python API documentation

Added patch from Brandano with some small improvements (BF_DOCDIR, clean) by yours truly.

To use make sure you have epydoc installed. Enable with WITH_BF_BPYDOC=1.
2008-10-19 22:01:46 +00:00
Ken Hughes
a6b1c0a8cc Added WITH_BF_NOBLENDER to scons so that blenderplayer can be compiler by itself (false by default). Also added dependency for 'blender' on command line; seems 'blender' was intended to be a target, but would give the error "Do not know how to make target `blender' ". 2008-10-19 21:25:17 +00:00
Ken Hughes
4693a5af48 Linux platforms
---------------
Patch to include freedesktop icons in linux release builds, contributed by
Ralf Hölzemer (cheleb).
2008-09-19 21:00:45 +00:00
Campbell Barton
15bce017df scons update, BF_NO_ELBEEM wasnt working, WITH_BF_SDL wasnt implimented, WITH_CCGSUBSURF isnt used anymore. 2008-09-19 01:39:34 +00:00
Campbell Barton
8d1163c639 scons options BF_CXX, WITH_BF_STATICCXX, BF_CXX_LIB_STATIC for static linking to stdc++ because of problems running blender on some systems. 2008-09-18 03:05:02 +00:00
Campbell Barton
0f39be9ce8 added static openal and openexr options for scons.
also added a target 'blenderlite' - turns almost everything off, compressed binary is ~3.4meg
2008-09-16 06:31:55 +00:00
Daniel Genrich
8d285fc10a Fix for better icc + openmp support using scons 2008-08-04 17:24:11 +00:00
Stephen Swaney
6613ac0d88 Change plugin.def to pluging.DEF for case sensitive operating systems.
File is source/blender/blenpluginapi/plugin.DEF
2008-05-01 14:22:21 +00:00
Nathan Letwory
4e9cbe2ac7 * copy plugin header stuffies too. 2008-05-01 13:54:25 +00:00
Nathan Letwory
7d1b40d890 * improve the clean code. Instead of doing it the dumb way, do it smarter. 2008-04-28 19:48:44 +00:00
Nathan Letwory
a9ab9f4bde * make sure makesdna executable gets removed on scons clean. 2008-04-28 17:14:20 +00:00
Nathan Letwory
1da7742b8a * change BF_CONFIG so that it is understood as 'user-config.py' instead of config/platform-config.py it tried to do before. If defined, it overrides the search (and potential use) of user-config.py.
It didn't work before anyway, so this change should affect nobody.
   usage: scons BF_CONFIG=someconfigfile
2008-04-27 20:17:14 +00:00
Ken Hughes
e10cb55936 Make "scons clean" remove config files for ffmpeg, x264, xvidcore. Also
replace tabs with spaces.
2008-04-27 19:20:35 +00:00
Nathan Letwory
6553b71271 * let's copy *all* FFMPEG libraries, shall we? 2008-04-27 19:13:40 +00:00
Nathan Letwory
7e7118aebb * copy FFMPEG libraries on Windows to BF_INSTALLDIR when done. 2008-04-27 17:00:22 +00:00
Ken Hughes
a1689a5e9a Change scons so OpenMP library is appended at end of linkage line with other
libraries (fixes a problem with statically linking OpenMP).
2008-04-17 19:01:00 +00:00
Chris Want
5d0a207ecb Patch from GSR that a) fixes a whole bunch of GPL/BL license
blocks that were previously missed; and b) greatly increase my
ohloh stats!
2008-04-16 22:40:48 +00:00
Campbell Barton
9aa985abe6 minor edit to last commit, fixed a possible python error 2008-04-08 20:08:46 +00:00
Campbell Barton
dba13f922a use mkdtemp for the scons tempfile path rather then '.sconf_temp', this way 2 blenders can be compiled at once from the same path. (debug and release for instance, as long as they build in their own dir) 2008-04-08 17:01:11 +00:00
Jean-Luc Peurière
126ab7974d NDOF support added to trunk from ndof branch.
The latter is now obsolete and will be soon 
removed.

Some tiny build tweaks for darwin committed
in preparation of bigger changes for proper
SDK suport both on intel and ppc
2008-03-22 01:39:11 +00:00
Nathan Letwory
285870d53b * BF_QUIET can now be set in user-config.py too. 2008-03-19 17:23:14 +00:00
Daniel Genrich
3a7b420ec6 Bugfix for wrong OpenMP flags when using icc (proposed by jensverwiebe via IRC) 2008-03-05 14:58:33 +00:00
Nathan Letwory
23aad3c5fe * change integral type of loop var in two cases so OpenMP support compiles with MSVC, too.
* remove wrong flag.
2008-02-11 08:27:54 +00:00
Nathan Letwory
ebbe718237 * Building with FFMPEG-support on Windows works only for mingw. And those libs are static anyway. 2008-02-04 06:44:13 +00:00
Daniel Genrich
77685023ca Initial commit of cloth modifier from branch rev 13453 2008-01-29 21:01:12 +00:00
Nathan Letwory
eb5643fcd0 * copy python25_d.dll when building BF_DEBUG=1 2008-01-24 07:25:02 +00:00
Nathan Letwory
381e8b16b4 A little christmas present for the lazy coders.
In your user-config.py you can now set BF_FANCY='false' and enjoy the... lack of colors
2007-12-20 17:52:57 +00:00
Campbell Barton
4cb953e60e scons clean would throw an error if there was nothing to do. print a message instead. 2007-08-31 19:17:22 +00:00
Jean-Luc Peurière
42b629a69b add the option of not installing to scons build system
settting WITHOUT_BF_INSTALL='true' will disable
 the copying to INSTALL_DIR

you can use that in your user-config.py or commandline

slipping in minor cleaning for Os X builds
2007-08-14 20:55:59 +00:00
Nathan Letwory
a41fe79f6e * make sure zlib.pyd is copied on windows 2007-06-14 15:26:40 +00:00
Nathan Letwory
8b2a129294 === SCons ===
* Finally cleaned up the NSIS installer creation process
  This is now a proper action and command, with simple printout
  The 'nsis' target (only on Windows) now properly depends on
  all the build process, and will be done as very last.
* Make LZMA (Solid) default compressor for installer (= the best)
2007-05-31 11:15:47 +00:00
Nathan Letwory
1badf04923 === SCons ===
FINALLY! With this commit command-length problems are History. Thanks go to xuru from #scons for giving the nice pointer.
src is now again one lib, and further libsplitting should be rather unnecessary, unless we somehow reach the 37K limit (for internally used CreateProcess, by subprocess module)
2007-05-31 07:42:54 +00:00
Simon Clitherow
0ba63005b3 Copying python25.zip to install folders for win32.
Also, nsis installer now copies plugin include headers.
2007-05-28 11:11:15 +00:00
Jean-Luc Peurière
c0dcbacd4b post release update of the scons build system for os x powerpc
assume os x 10.4 as defaut
2007-05-19 22:57:28 +00:00
Nathan Letwory
d0c94b83f1 === SCons ===
* cvs->svn conversion: handle properly also release/scripts .svn dir (= skip it!)
2007-05-15 12:53:44 +00:00
Nathan Letwory
eea80750a6 * handle move CVS->SVN, skip .svn administrative directories 2007-05-12 14:11:27 +00:00
Nathan Letwory
3c5820e69b === FFMPEG on Win32 ===
* rebuilt ffmpeg libraries. h264 now actually works.
2007-05-06 22:13:38 +00:00
Nathan Letwory
581970a640 === SCons ===
* enable TWEAK_MODE with BF_TWEAK_MODE=1 on cmd-line. Can also be specified in user-config.py
2007-04-05 05:14:50 +00:00
Nathan Letwory
d31355fa24 === SCons ===
* Fix for [ #6490 ] "Building with Python 2.4 on Win32 doesn't copy the proper python DLL file"
2007-04-05 04:48:32 +00:00
Nathan Letwory
42fa2ba00b === SCons ===
Patch provided by Emmanuel Turquin: copy a proper bundle
 on OSX. I take it he has tested
 this on OSX :) Other OSX-ers, please do verify :) (/me hugs his Windows)
2007-03-29 04:28:29 +00:00
Nathan Letwory
3aaea833b9 === SCons ===
Copy the Python 2.5 dll on windows, not 2.4. Also commented out the copying of the
 python24.zip and zlib.pyd. I'm under the impression there is a concensus we want
 users to install py25 if they want to use it.
2007-03-01 05:00:24 +00:00
Simon Clitherow
b5ca98f143 Added windows NSIS installer script to scons. Not pretty, but it works :)
To use:

Make sure NSIS is in your %PATH% and type 'scons nsis'

It doesn't currently compile blender first, so make sure you do a
normal 'scons' before this.
2007-02-15 17:00:22 +00:00
Chris Want
bfaa86b773 Disabling the code is revision 1.161 that was tripping up users
building with mingw.
2006-12-10 17:22:47 +00:00