Commit Graph

42 Commits

Author SHA1 Message Date
Ken Hughes
2a3d159b06 Add BF_X264_CONFIG and BF_XVIDCORE_CONFIG flags to scons, to allow passing
configuration info for cross-compiling to ./configure scripts.  Also let
makesdna use PLATFORM_LINKFLAGS.
2008-04-28 16:14:31 +00:00
Nathan Letwory
8188fd9b97 * try/except block around import of BoolOption, to make sure one can use scons-0.98.2 to compile with. 2008-04-28 10:47:45 +00:00
Nathan Letwory
ec02fff2aa * make sure BF_CONFIG is an accepted ARGUMENT 2008-04-27 19:51:49 +00:00
Jean-Luc Peurière
0b7900d081 this commit allow to pass custom compile flags
to all ffmpeg related libs

ffmpeg use it own build system and dont respect 
the flags in config.py

define BF_FFMPEG_EXTRA in config.py to pass 
those flags.

I use this on Os X to pass the SDK vars :
-isysroot
-mmacosx-version-min
2008-04-27 18:22:07 +00:00
Kent Mein
45dee507aa I can't spell ;)
(typo fix in the comments)

Kent
2008-04-17 20:29:57 +00:00
Kent Mein
867e12836b This patch spawns from this game engine issue:
[#7113] GE crash pressing as soon as P on 64 bit


Note:         glext.h has been removed from the source
        If you get errors compiling with it you have 2 options
                download/install 	glext.h        (preferred method)
                or set WITH_BF_GLEXT=false
        If your a user and having problems with game engine try
                setting the env var: WITHOUT_GLEXT 1

Kent
2008-04-16 17:40:59 +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
77685023ca Initial commit of cloth modifier from branch rev 13453 2008-01-29 21:01:12 +00:00
Campbell Barton
5a4fc7a8fd made BINRELOC disabled by default with scons, only enable for linux 2008-01-19 18:52:39 +00:00
Kent Mein
320ac3f0e2 Fixing makefiles for binreloc I made it use flags like other
things default on for linux.  ideasman helped me get scons working.
Cmake still needs some love...

Kent
2008-01-18 21:39:47 +00:00
Martin Poirier
2b49858b02 Missing change in previous BPy revert.
This was only the added build options in scons, so no harm done.
2007-12-23 23:41:16 +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
a4dc7c6676 rename WITH_PYAPI_V24X to WITH_BPYAPI_V24X (because its blender's api version number not pythons), made 24x api use its own armature weakref list since pyobject types are different. 2007-12-17 11:32:52 +00:00
Campbell Barton
079d78f183 * Added an option not to compile the 2.4x api (WITH_PYAPI_V24X for Makefiles and WITH_BF_PYAPI_V24X for scons)
* ghash wasnt being set to null when python stopped and was segfaulting on exit
2007-12-16 06:50:49 +00:00
Joshua Leung
4b37ee227e Scons Compiling Hack:
Restoring the "evil src splitting hack" for scons+mingw systems. By default, it is not used, but if your system is choking when trying to link src, then add BF_SPLIT_SRC=1 to your user-config.py to use this hack.
2007-11-29 06:31:36 +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
Kent Mein
613646b33e This commit is a modified version of patch #6860
It adds read only dds support.  (Writing will come later)

Kent
2007-06-25 19:50:25 +00:00
Nathan Letwory
9a78468ab0 * put a try block around import subprocess. Apparently there can be broken python installs without the subprocess module. This is useful on win32 with mingw only anyway. 2007-06-06 07:07:58 +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
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
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
Andrea Weikert
32d49a8dae ==== scons ====
- cleanup for wintab library headers
- properly define BF_WINTAB and BF_WINTAB_INC
2006-11-13 06:40:08 +00:00
Nathan Letwory
7c3cdb21a3 * control the creation of .bsc files when BF_DEBUG=1 on win32-vc. BF_BSC=1 (default for BF_DEBUG=1) will have .bsc generated, but this takes an awful long time, so BF_BSC=0 will skip that step. 2006-11-03 08:13:01 +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
1266234202 * remove the .Append(LIBS = ['libverse']), since it confused the build system.
* removed unused options BF_VERSE_LIBPATH, BF_VERSE, BF_VERSE_LIBS, since they are not used at all.
* some whitespace mods

There should be no more issues with "libverse.lib" not being found (or anything like
 that).
2006-10-11 07:28:37 +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
Nathan Letwory
800ae7cf46 [ #4035 ] patch to make scons compile with ffmpeg in mingw
Submitted by Joseph Eagar (joeedh). windows/gcc ffmpeg library may need recompiling to support all codecs necessary (ie. H264 doesn't work).
2006-08-14 12:47:13 +00:00
Nathan Letwory
b92c2197ec ==SCons==
* Applied patch #4012 by Joseph Eagar. The patch provides a way to quickly assign a list
  of libraries to build with debug symbols. Usage:

  scons BF_QUICKDEBUG=src,bf_blenkernel,bf_blenlib
2006-03-17 16:38:39 +00:00
Nathan Letwory
0b9c41e551 ==SCons==
* actually add CC and CXX to option handling, so they get also read in
  from (platform)-config.py and user-config.py
2006-03-13 08:49:06 +00:00
Nathan Letwory
f365dd2d91 ==SCons==
* BF_DEBUG_FLAGS was missing for the allowed cmd-line arguments. Oops!
2006-03-06 14:50:08 +00:00
Nathan Letwory
d9f9e76500 ==SCons==
+ SCons support for pthreads-win32. Library will be committed shortly into
  lib/windows, so be sure to check commit list and update that as well
  when the pthread lib is available.
2006-02-25 14:53:27 +00:00
Nathan Letwory
2f8f1b8cdf ==SCons==
+ When giving CC and CXX on the command-line you can specify what compiler
  to use:

  scons CC=gcc-3.3 CXX=g++-3.3
2006-02-23 21:08:40 +00:00
Nathan Letwory
11fd198a70 ==SCons==
* when WITH_BF_STATICOPENGL=1 on Linux Blender will be statically linked
  against GL libraries. NOTE: I used values that worked on my machine -
  platform managers and people who have better knowledge about this, please
  modify config/linux2-config.py accordingly.
2006-02-21 12:36:50 +00:00
Nathan Letwory
092e7385d9 ==SCons==
*remove double WITH_BF_FFMPEG
2006-02-05 22:11:04 +00:00
Peter Schlaile
250c9de1bc Adds ffmpeg-support on Linux-platforms. Since ffmpeg is installed
always statically (you have to force it to build a dynamic library) the
resulting binary is redistributable.

The code is made ffmpeg-version independent using #ifdef's.
2006-02-05 19:49:29 +00:00
Nathan Letwory
f17bdcb2e4 ==SCons==
* Add WITH_BF_FFMPEG to scons system. Needs to be added to (platform)-config.py
  still. Otherwise defaults to  'false'.
2006-02-05 19:29:48 +00:00
Nathan Letwory
896b6288ca ==SCons==
* remove useless BF_TIFF* options. Upon closer inspection of code, only
  path to headers is needed
2006-02-05 17:50:19 +00:00
Nathan Letwory
631a8d85d4 * WITH_BF_GETTEXT and WITH_BF_FREETYPE are merged into WITH_BF_INTERNATIONAL
* typo in adding BF_OPENAL_LIBPATH, resulting in it not being added at all
2006-02-05 12:24:52 +00:00
Nathan Letwory
4e82647e86 ==SCons==
+ BF_BUILDINFO=1 (by default) for build info in splash
- remove redundant renderconverter include dir
* check for win32-vc instead of only win32, so MingW compile goes ok
2006-02-04 16:36:37 +00:00
Nathan Letwory
3bb82a27fc == SCons ==
* This commit is all of the rewrite work done on the SCons system. For
  documentation see doc/blender-scons.txt and doc/blender-scons-dev.txt.
  Also http://mediawiki.blender.org/index.php/BlenderDev/SconsRefactoring
  contains valuable information, along with what still needs to be done.

    - linux, os x and windows compile now.
    - files are compiled to BF_INSTALLDIR (see config/(platform)-config.py)
        - NOTE: Jean-Luc P will commit sometime during the weekend proper
          appit() for OS X. For now, copy the resulting binary to an
          existing .app bundle.
    - features:
        - cleaner structure for better maintenance
        - cleaner output during compile
        - better handling of build options
        - general overall speed increase
        - see the wiki for more info

  Cygwin, FreeBSD and Solaris systems still need work. For these systems:
    1) copy a config/(platform)-config.py to ie. config/cygwin-config.py
    2) set the proper defaults for your platform
    3) mail me at jesterking at letwory dot net with you configuration. if
       you need any modifications to the system, do send a patch, too.

  I'll be giving first-aid today and tomorrow, after that it'll be all
  regular development work :)

  /Nathan
2006-02-04 14:15:10 +00:00