Commit Graph

96 Commits

Author SHA1 Message Date
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
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
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
Joseph Eagar
31b04490d1 removed mingw from the list of platforms to use the
debug python lib, as it was causing link errors.

if someone wishes to figure out why this is messing up,
go ahead.
2008-02-26 00:04:54 +00:00
Daniel Genrich
7a7a52226f makes bullet independant from gameengine for cmake, introduces esc-key during sim, disables collisions when no bullet there 2008-01-29 23:13:31 +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
Kent Mein
90715580b9 This is patch: [#7129] Solaris build is linking with c instead of c++ compiler
I talked to Jesterking and he may switch this to a more global
solution later.  I figured in the meantime its ok to commit this
and consider the issue resolved.

Kent
2007-12-06 21:41:22 +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
Campbell Barton
c6667c53e3 put the revision number in the splash screen (scons and make) 2007-11-15 12:16:03 +00:00
Andrea Weikert
70edf4e293 fixing some compile problems with MSVC7.1/scons
* stupid misplacement of declaration
* replacing fmodf with fmod (fmodf not available with MSVC7.1 when compiling C-code)
* appending CXXFLAGS to CCFLAGS in tools/Blender.py to avoid linking errors with runtime library (/MT not set) 
  - jesterKing, could you please check if that's ok?
2007-09-23 13:52:08 +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
475d4ce227 * svn+ssh test 2007-05-22 22:20:35 +00:00
Stephen Swaney
4e66d4e676 fix mashup of CCFLAGS and CXXFLAGS for scons builds.
CXXFLAGS defaults to CCFLAGS which was causing duplicated or
extra compile flags being set for g++.  Fix is to use
env.Replace() rather than .Append() the first time we
set CXXFLAGS in the build environment.
2007-04-13 06:30:34 +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
Nathan Letwory
48b07b4822 ==SCons==
* link against debug library of python on win32
2006-11-24 06:08:05 +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
Kent Mein
14b6fd1209 Tweaks for ICONV stuff in scons.
Kent
2006-11-10 17:59:40 +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
d1066fc266 ==SCons==
* Source Browser support. When BF_DEBUG=1 .bsc-files will be created in BF_BUILDDIR. .pdb-files are in the root source dir
2006-10-19 12:35:39 +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
Jean-Luc Peurière
0efdd46cea fixing scons build for Os X with verse enabled.
there is no need to bundle the verse binary.


Blenderplayer build is still broken. Verse maintener please add
the needed stubs for it
2006-10-03 20:25:59 +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
Kent Mein
6c89868386 Adds scons support for SunOS...
(I have one small problem with linking python's static library but
other than that this should work)

Kent
2006-08-03 02:46:37 +00:00
Ken Hughes
9cc25e5a15 Make scons pick up default link flags from previous commit on linux platforms;
statically-linked python releases won't work otherwise.  Bugfixes for #4676
and #4486.
2006-07-14 04:13:55 +00:00
Campbell Barton
6f051c4dee this file had dos line endings and was causing errors with MSVC express according to artificer.
all the other py files were unix so this is the odd one out.
2006-07-05 21:51:03 +00:00
Jean-Luc Peurière
88bfc44ca2 some of the .po file had empty msgids and multilline comments from
generator which were making garbage of some sub-menus.
generated fresh .mo files
added a missing copy in appit for Os X
2006-06-27 21:48:54 +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
Stephen Swaney
c538f3e19f tweak SCons to use Split() to parse BF_DEBUG_FLAGS and BF_PROFILE_FLAGS
properly when they have multiple options.
2006-03-14 18:28:47 +00:00
Nathan Letwory
36a4af22c3 ==SCons==
* These changes bring cross-compiling Blender for Windows on Linux one step
  closer to reality. The 'biggest' change is in makesdna SConscript to make
  sure a linux native makesdna is built, that can be run, too. Next to that
  proper checks for env['OURPLATFORM']=='linuxcross' are added in various
  places.

  Switch change in pluginapi.c was necessary, and AFAIK it should work like
  that also on WIN32, if not, slap me.

  Note: everything *compiles* now nicely, it is just that the final *linking*
  doesn't work (yet). Anyone who fixes this will be the
  hero of cross-compilers :)
2006-03-13 11:42:49 +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
52dfa31cb8 ==SCons==
+ Joseph Eagar provided a patch that re-enables the application icon for Blender. Hurray!
2006-03-10 20:47:34 +00:00
Nathan Letwory
a71c07a044 ==SCons==
* change CCFLAGS to CXXFLAGS and CFLAGS to CCFLAGS to be better
  for SCons
- removed old cruft from ancient system
2006-03-10 20:11:48 +00:00