Commit Graph

64 Commits

Author SHA1 Message Date
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
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
ffcbde116e ==SCons==
* make sure PLATFORM_LINKFLAGS are used on Cygwin, too
2006-02-05 18:03:02 +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
9b36ffca12 * add proper WITH_BF_TIFF checks 2006-02-05 17:29:22 +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
c5a0e79fb0 - removed redundant code 2006-02-05 12:08:32 +00:00
Jean-Luc Peurière
a91c077152 packaging in bundle of the Os X binary. result in the bin of build dir
Important note, the install target install only the binary not the
packaged bunde for the moment
2006-02-05 11:28:28 +00:00
Nathan Letwory
257124a44f - remove Xmu and Xext from linking line for linux2, as they are not needed
+ WITH_BF_OPENAL actually enables or disables use of OpenAL
+ WITH_BF_OPENEXR removes openexr libs from linking if disabled
2006-02-05 11:11:44 +00:00
Nathan Letwory
3d3f5d1640 + WITH_BF_OPENAL=0 should now actually not need OpenAL stuff
* BF_PROFILE_FLAGS to list form
2006-02-05 01:09:40 +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
e48ed941a0 ==SCons==
* If you set C_WARN=[] and CC_WARN=[] in your user-config.py, no complaints
  whatsoever should show. Otherwise a lot of warnings are shown.
2006-02-04 15:52:55 +00:00
Nathan Letwory
c0234bd9ec ==SCons==
* add REL_CFLAGS and REL_CCFLAGS when not building debug. This adds NDEBUG
  to compile on Win32
* fix path to makesdna binary
2006-02-04 15:44:34 +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
Jean-Luc Peurière
4db91f9784 commented out lib not anymore needed in scons build system 2006-01-24 00:05:47 +00:00
Kent Mein
c693e01b8d Ton forgot a few modifications to the Scons and Makefile build systems.
These should make it so that other people can compile with OpenEXR support.

(I also added the OPENAL fix erwin commited to bf-blender since I
need it for my machine, and this syncs up the file)

Kent
2006-01-09 02:18:11 +00:00
Erwin Coumans
872b2a03e3 attempt to fix a link problem by changing the link-order or ketsji/bullet 2005-10-29 17:54:04 +00:00
Johnny Matthews
1d366b3fe9 Scons files for Boolop
also a fix in BOP_Material so that MSVC won't complain about template issues
2005-10-29 13:26:31 +00:00
Erwin Coumans
0dde486eea applied patch [ #3260 ] Enable compile bullet and sumo with scons 2005-10-28 04:48:01 +00:00
Erwin Coumans
745fc2f9d0 updated SConstruct and Makefile so that if you compile the gameengine, is always enables bullet, independent of sumo/ode.
So for the 2.4 release, both bullet AND sumo will be enabled. You can choose in the world buttons which physics engine is active for a scene.

sorry if this breaks your builds!
2005-10-23 17:55:19 +00:00
Simon Clitherow
46f401c6c0 too much indentation! 2005-10-13 20:05:00 +00:00
Simon Clitherow
5b260edf49 indentation got messed up! 2005-10-12 20:59:47 +00:00
Simon Clitherow
6c33918c56 last minute updates for releasing on Windows...
scons 'wininst' target fixes (py2.3 -> py2.4)
2005-10-12 20:51:00 +00:00
Jean-Luc Peurière
e2d577de9e initial commit of the fluid simulator.
Ton reviewed and gave his blessing.
Zr, can you have a look ?

see :
http://projects.blender.org/tracker/?func=detail&atid=127&aid=3039&group_id=9

for initial comments.

N_T : the solver itself (elbeem) needs some works to get rid of
warnings
2005-09-18 13:27:12 +00:00
Simon Clitherow
208da2a5d0 Added support for compiling BULLET with scons on windows
using bandoler's patch as a basis (thanks!).

A couple of notes:

-  This is for windows only, I did not have a chance to try linux yet.

-  SConscript for PHY_Bullet may need tweaking (plus support
 for other platforms), but at least it's in there :)

Any problems, shout :)
2005-08-01 21:19:41 +00:00
Stephen Swaney
348890d423 SCons fix for blenderplayer: add blender_LOD to link lib list. 2005-07-26 22:22:48 +00:00
Stephen Swaney
fd4df5e8b0 SCons fix: move blender_LOD after blender_blenkernel in link list to fix
problems with undefined refs.  Let's see what this breaks!
2005-07-26 14:32:03 +00:00