Commit Graph

106 Commits

Author SHA1 Message Date
Ton Roosendaal
7eee2e7f8a SConstruct is 2.37a now 2005-06-13 20:56:19 +00:00
Ton Roosendaal
df89dbfbab Version codes for release building + splash.jpg 2005-05-29 19:14:21 +00:00
Jean-Luc Peurière
4e98a84cee change for libpng includes path on openBSD
requested some times ago by Nathan houghton
2005-05-29 12:06:53 +00:00
Nathan Letwory
bcd5d1c9ed * integrate bFTGL with Scons
* add some ENV = os.environ's here and there (help those who have msvc toolkit installed)

Note for OSX users: check from your config.opts the correct info for the precompiled ftgl lib is used.
2005-05-06 13:37:18 +00:00
Stephen Swaney
3428362140 Remove USE_CCGSUBSURFLIB stuff since it is always on now. 2005-03-31 16:21:08 +00:00
Stephen Swaney
9b6febecd3 Two scons changes:
1) fix evil use of internal scons interfaces that breaks latest scons version.

2) a hack to turn on new CCGSUBSURF stuff by adding -DUSE_CCGSUBSURFLIB
to extra_flags.  This is currently the default for all platforms except
win32 (due solely to my ignorance of win32 compiler flags).
2005-03-30 12:13:02 +00:00
Kent Mein
ecf6de151c This commit reverses the OpenEXR specific stuff in the OpenEXR commit I
did last friday.  A patch will be available in the patches tracker
that will have the current stuff there until everything is working.

Kent
2005-03-14 14:56:40 +00:00
Kent Mein
48b4329170 *sigh* I obviously rushed this. I honestly thought that this commit would
not affect anyone.

Changed:
if user_openexr == 'false':
	defines += ['WITH_OPENEXR']

To what it was suppose to be:
user_openexr = 'false':
if user_openexr == 'true':
	defines += ['WITH_OPENEXR']

This was messed up on most platforms, somewhere when adding them all
I switched to the bad version and continued with that...

I'm on irc if anyone else has any commits to clean this up.  I'm going
through things and trying to make sure its working for everyone.

Sorry,

Kent
2005-03-12 16:32:32 +00:00
Kent Mein
a1919e6db4 Gernot Ziegler's patch to add OpenEXR support to blender.
To enable it you will need to download OpenEXR and install it.
For the Makefiles you will need to set WITH_OPENEXR=true
and set NAN_OPENEXR to point to where OpenEXR is installed.

For scons you'll need to remove config.opts to get the new options
so you can enable OpenEXR, I was not able to get blender to link
with scons so the scons stuff may need to be tweaked a little but
I think it should work.

For other platform managers  The OpenEXR stuff is similar to QUICKTIME
you need to define WITH_OPENEXR and setup the library stuff and
as you'll notice in this commit there are two extra files.

Kent
2005-03-11 20:16:14 +00:00
Kent Mein
427ff274a2 Joseph Gilbert's fixes for the linux2 build target.
Kent
2005-02-15 13:06:08 +00:00
Jean-Luc Peurière
d0aa7eac41 support for new SDL build in makefiles and scons for Os X 2005-02-02 22:13:23 +00:00
Jean-Luc Peurière
1927dfa241 update to scons for Ton SDL threads 2005-01-02 16:35:48 +00:00
Ton Roosendaal
610cec55c7 Biiig commit! Thanks to 2-3 weeks of cvs freeze...
Render:
- New; support for dual CPU render (SDL thread)
  Currently only works with alternating scanlines, but gives excellent
  performance. For both normal render as unified implemented.
  Note the "mutex" locks on z-transp buffer render and imbuf loads.
- This has been made possible by major cleanups in render code, especially
  getting rid of globals (example Tin Tr Tg Tb Ta for textures) or struct
  OSA or using Materials or Texture data to write to.
- Made normal render fully 4x32 floats too, and removed all old optimizes
  with chars or shorts.
- Made normal render and unified render use same code for sky and halo
  render, giving equal (and better) results for halo render. Old render
  now also uses PostProcess options (brightness, mul, gamma)
- Added option ("FBuf") in F10 Output Panel, this keeps a 4x32 bits buffer
  after render. Using PostProcess menu you will note an immediate re-
  display of image too (32 bits RGBA)
- Added "Hue" and "Saturation" sliders to PostProcess options

- Render module is still not having a "nice" API, but amount of dependencies
  went down a lot. Next todo: remove abusive "previewrender" code.
  The last main global in Render (struct Render) now can be re-used for fully
  controlling a render, to allow multiple "instances" of render to open.

- Renderwindow now displays a smal bar on top with the stats, and keeps the
  stats after render too. Including "spare" page support.
  Not only easier visible that way, but also to remove the awkward code that
  was drawing stats in the Info header (extreme slow on some ATIs too)

- Cleaned up blendef.h and BKE_utildefines.h, these two had overlapping
  defines.

- I might have forgotten stuff... and will write a nice doc on the architecture!
2004-12-27 19:28:52 +00:00
Ton Roosendaal
2d7289f3f5 Accidentally committed corrupt SConstruct.... here's the one fixed 2004-12-21 17:00:25 +00:00
Ton Roosendaal
0ef03ae620 Upped sconstruct for 2.36 release 2004-12-21 16:25:37 +00:00
Wouter van Heyst
fe50974370 bump version to 2.35a for scons 2004-11-18 15:39:05 +00:00
Nathan Letwory
1e7370c535 Buildinfo would give player instead of dynamic 2004-11-14 20:37:32 +00:00
Nathan Letwory
044052328b bump version to 2.35 for scons 2004-11-14 20:31:32 +00:00
Jean-Luc Peurière
cd7b789907 more conservative default build options for OS X
O3 works thought on my system, but should not be set on reference releases
2004-11-14 14:38:03 +00:00
Jean-Luc Peurière
70c576ab37 added correct new defaults for building solid.
We used previously the precompiled lib
2004-11-07 21:34:17 +00:00
Michel Selten
461e07aedd SConstruct now looks for tools/scons/bs for the files. This used to be just
bs.
2004-10-20 20:17:42 +00:00
Nathan Letwory
9781fec228 indentation commit -> use hard tabs (as decided in meeting) 2004-09-26 10:56:38 +00:00
Nathan Letwory
f9542b45bc This commit makes a structural change to SConstruct. Many of the functionality for it has been split of in a new package bs. This structural change is in preperation for changes Michel has planned against the option jungle.
More information on the wiki: http://wiki.blender.org/bin/view.pl/Blenderdev/SconsRefactoring
2004-09-25 20:44:57 +00:00
Kester Maddock
3eddbfa942 Fix link ordering for blenderplayer. 2004-09-20 10:41:16 +00:00
Hans Lambermont
0ce1304e1b Theodore Schundler's patches to add FreeBSD support to the scons build
system.
2004-08-15 18:09:37 +00:00
Nathan Letwory
924cd728e2 This commit prepares for 2.34:
* LarstiQ patched SConstruct to have it name tarballs and zips better for 'scons release'
* bump version numbers to 234
* added splash.jpg and datatoc'ed version
* add release notes

People can now do still some final tests. Can you feel the heat?
2004-08-04 22:00:41 +00:00
Nathan Letwory
d3a9eae00d * make sure all contents of bpydata are included in installer and archives 2004-08-02 11:02:14 +00:00
Simon Clitherow
2a749931ba - added missing py scripts to the non-sconsered NSIS installer script
- uninstall files now done semi-automatic for 'scons wininst'
2004-08-01 21:13:41 +00:00
Jean-Luc Peurière
4f278a78d4 python scripts are not found if they are not placed in a .blender folder
inside MacOs folder of bundle.

their previous location (ressource folder) would however be more logical.
2004-07-29 23:21:05 +00:00
Jean-Luc Peurière
1f9f2d66eb bug correction for bundle creation on OS X. 2004-07-28 23:45:52 +00:00
Simon Clitherow
6f30f4aaab - added python23.zip & zlib.pyd (bundled python modules for Win32)
provided by IanWill (thanks!)

- updated build systems to suit
2004-07-28 18:28:17 +00:00
Simon Clitherow
d2da4f7160 - small fix for the scons 'wininst' target, plus a typo correction :) 2004-07-28 17:24:37 +00:00
Jean-Luc Peurière
09dc9c4066 forgot to copy back a change from my config.opt to SConstruct 2004-07-28 09:09:32 +00:00
Jean-Luc Peurière
0b9cf9006a compile options for macos X builds 2004-07-27 20:31:03 +00:00
Brecht Van Lommel
5881af9306 Fix bug #1466: Crash on decimating non-manifold mesh in scons build.
- Enabled the NDEBUG define (to disable assertions) on all platforms in scons.
  This is already the default in Makefiles.
- Free MEdge data after decimating, it is not valid anymore.
2004-07-25 10:49:25 +00:00
Jean-Luc Peurière
f6a6a5a279 made Scons work again for Os X bundle creation 2004-07-18 19:02:56 +00:00
Nathan Letwory
ce51ed822d Make sure that the hex value is checked as a hexvalue. On some systems this was apparently a problem. 2004-07-15 17:47:43 +00:00
Nathan Letwory
3dbd149de2 * on OS X the 'blender$PROGSUFFIX' caused problems due to SCons expanding it too late.
This is now fixed by manually setting target to 'blender'
2004-07-15 08:26:17 +00:00
Nathan Letwory
04408c3d76 * the clean target was doing some strange dependency stuff, so I changed that. As a bonus, it doens't read the SConscripts anymore, but just deletes the directories with object files. I leave the signature databases, since deleting them tended to give warning messages on subsequent runs.
ps. if it doesn't work, shoot me (and Jens, since he tested too ;)
2004-07-14 20:55:17 +00:00
Nathan Letwory
09cda2e74b * use sys.exit() instead of exit()
* scons clean -> does a quick(er) clean. No need to think, just scons clean (it removes all content of root_build_dir)
2004-07-14 18:14:49 +00:00
Nathan Letwory
ef8254d05f * Tell compilers they really need Python 2.3 when trying to SCons it all. 2004-07-14 17:26:04 +00:00
Nathan Letwory
80dc492a5e * rewrote part of the targets code
* added 'scons wininst'. This will create a NSIS installer for blender.
  This will need the NSIS tool in your path (makensis.exe).
  The needed scriptfile will be committed seperately, so remember
  to 'cvs update -d'

* tested on windows and linux, so other platform maintainers, please
  check that the build process is not broken.
2004-07-14 14:10:39 +00:00
Nathan Letwory
7a04f91f32 * the default 'scons' process now just builds Blender, but does no packaging, zipping or tarballing
* 'release' must be explicitely given as target to get all nicely wrapped up
2004-07-14 06:09:29 +00:00
Nathan Letwory
bf8c3e2020 * colon after def printadd() added to have correct and running python again :) (sorry, must've been subconsious spasm)
* made the build not depend on blenderplayer, so that it continues even when you have not the blenderplayer enabled
2004-07-13 19:10:34 +00:00
Nathan Letwory
9f8eea7882 * Added a release target to SConstruct -> 'scons release':
- after building blender and blenderplayer an archive is created in bin/ containing all necessary files
      - you'll need now python2.3 or newer for SConstruct to go through correctly. This is not a problem,
        since Blender requires python2.3 now anyway.
      - the release target has been done for linux, win32 and os x, other platforms get a
        warning message after blender has been built, just no package. See warning message for instructions
      - for linux, osx and win32 the blenderplayer target has been enabled for default
      - the build is logged to build.log for all platforms except win32. If you want it, you'll need tee.exe from
        http://unxutils.sf.net in your path (I put it in C:\\windows) and change the first if check in the
        SConstruct accordingly
2004-07-13 17:01:58 +00:00
Brecht Van Lommel
4f1c674ee0 Added SuperLU 3.0:
http://crd.lbl.gov/~xiaoye/SuperLU/

This is a library to solve sparse matrix systems (type A*x=B). It is able
to solve large systems very FAST. Only the necessary parts of the library
are included to limit file size and compilation time. This means the example
files, fortran interface, test files, matlab interface, cblas library,
complex number part and build system have been left out. All (gcc) warnings
have been fixed too.

This library will be used for LSCM UV unwrapping. With this library, LSCM
unwrapping can be calculated in a split second, making the unwrapping proces
much more interactive.

Added OpenNL (Open Numerical Libary):
http://www.loria.fr/~levy/OpenNL/

OpenNL is a library to easily construct and solve sparse linear systems. We
use a stripped down version, as an interface to SuperLU.

This library was kindly given to use by Bruno Levy.
2004-07-13 11:42:13 +00:00
Nathan Letwory
84b399364c * Fixed action conflict (win32):
When also enabling the blenderplayer there would be a action conflict for the resource building.
2004-07-11 20:14:54 +00:00
Nathan Letwory
ae4afb8268 * ensure winblender.res gets build too. 2004-07-03 22:01:04 +00:00
Nathan Letwory
3bf5e671d0 * Syntax error on line 1050 prevented scons from starting the compile process.
* Corrected some indenting
2004-06-23 14:56:30 +00:00
Kester Maddock
7d840a256e Correct blenderplayer target for sys.platform == win32 2004-06-07 10:10:13 +00:00