Commit Graph

192 Commits

Author SHA1 Message Date
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
Nathan Letwory
2f3c52bd67 ==SCons==
If win32all (http://sourceforge.net/project/showfiles.php?group_id=78018) is found,
 use it to be able to build with scons/mingw in (very) long paths. If it is not found,
 don't do anything groovy. This should make it possible to merge the cut up src lib.
 Those concerned, please do test that.

This bit of code is from http://www.scons.org/wiki/LongCmdLinesOnWin32
2006-11-30 12:39:09 +00:00
Nathan Letwory
48b07b4822 ==SCons==
* link against debug library of python on win32
2006-11-24 06:08:05 +00:00
Nathan Letwory
6c5c74244a whitespace commit 2006-11-21 05:56:41 +00:00
Nathan Letwory
af0d38d6ef Patch [ #5254 ] FFMpeg for scons for MSVC
from Guillaume Lecocq

I also added -D_CRT_SECURE_NO_DEPRECATE to shut the newer msvc version about deprecated functions (sprintf et al).
2006-11-20 11:15:35 +00:00
Kent Mein
14b6fd1209 Tweaks for ICONV stuff in scons.
Kent
2006-11-10 17:59:40 +00:00
Nathan Letwory
88446eeca4 Patch 5105 by Joshua Leung (Aligorith), slightly modified by me
* Add WITH_BF_YAFRAY, which per default is 'true', so no visible changes for developers (and users).

Set WITH_BF_YAFRAY to 'false', and you'll save some major compile time :) Also handy if you're strapped for memory and compilation fails on yafray compilation due
 to this.

- this commit also has a few whitespace changes and
- made BF_NO_ELBEEM a proper BoolOption. This will be renamed to WITH_BF_ELBEEM in the near future...
2006-10-18 05:45:47 +00:00
Nathan Letwory
859ea2fc01 * make verse compile with new verse release
* added -src/-dst patch from Emil (on my request - is already in verse CVS)
2006-10-03 11:33:41 +00:00
Nathan Letwory
7fd8ce8156 * Patch #4909 by Joseph Eagar (joeedh)
- this patch adds verse support for SCons, which can be enabled by
    giving WITH_BF_VERSE=1, ie. on command-line
  - this patch also adds a custom lib dir possibility. From the patch description:


 "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py."

* Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.
2006-08-22 13:04:07 +00:00
Nils Thuerey
f21f3cb290 - modified patch #4681, for scons compiling
of the fluidsim can now be disabled with the
	flag: BF_NO_ELBEEM='true', e.g. for irix systems.
	(The number of ifdefs from the original
	patch was reduced, and the defines are now
	only necessary when elbeem is switched off.)
- particle generation option is available again
2006-08-22 11:18:00 +00:00
Simon Clitherow
a6aa6b9ff4 =Scons=
Some additional external files were needed for correct running on
Windows - libtiff.dll, python24.zip, /release/windows/extra/*.*
2006-06-23 18:52:31 +00:00
Ken Hughes
9262cdbd0e Remove "print sys.version_info" accidentally left in from debugging. 2006-06-12 03:20:29 +00:00
Ken Hughes
e7a85df91e Bugfix #4089: Some Linux distros are using newer versions of OpenAL which
have FreeAlut (the OpenAL Utility Toolkit) separated out into libalut.  Added
a configuration test to check for libalut and add to LIBPATH if detected.
2006-06-04 15:54:23 +00:00
Ken Hughes
92e954e07a ===scons===
Bugfix #4088: Fix scons so that it installs subdirectories of release/scripts
into .blender/scripts.
2006-05-15 16:56:32 +00:00