Commit Graph

128 Commits

Author SHA1 Message Date
Erwin Coumans
631979f909 renamed some variables to make the timing in the game engine less confusing+minor improvements in this area.
enabled game engine for scons
2006-01-12 06:30:01 +00:00
Erwin Coumans
c94455c14d more linux game engine work. hopefully works now! 2006-01-08 09:37:15 +00:00
Erwin Coumans
0002cd63a5 disable game engine and gameplayer for all platforms except windows.
Then after cvs is unfrozen, development can continue.
2006-01-06 09:02:53 +00:00
Ton Roosendaal
a0d71f9534 Part 2 of commits for release, the release target name/version 2005-12-20 14:21:18 +00:00
Nathan Letwory
3a65f4e39f For sconstruct build blender linked against the winspool library. This seemed unnecessary, and test showed Blender running
fine without it. This probably solves #3503 too, so ZoneAlarm users, do test!

The same change should be done for the project files.

(#3503 http://projects.blender.org/tracker/index.php?func=detail&aid=3503&group_id=9&atid=125)
2005-12-16 20:58:16 +00:00
Johnny Matthews
936ed99cc6 Adding libtiff for win32 build 2005-11-23 14:53:51 +00:00
Toni Alatalo
590e1c1e4a uh should have read the patch better, i did test it and it works :) 2005-11-23 14:31:47 +00:00
Toni Alatalo
d40b4dbaf8 adding libtiff info to scons, applying http://vidar.gimp.org/tmp/scons-linux.diff 2005-11-23 14:28:40 +00:00
Matt Ebb
6d8a7d7819 * Attempting to fix scons for mac os x. It seems to be correct, if I've made a
mistake, someone can please help fix, just trying to get things to compile here
in the studio. You'll need to delete config.opts
2005-11-23 13:44:58 +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
D.J. Capelis
edad7a67b4 Build system - Bug Fix/Cleanup: Moving use_fluidsim variable to platform specific section where it belongs as per ML and IRC discussion. This allows platform maintainers some flexibility in determining what should be compiling on each system. Right now fluidsim is set as true everywhere and there is no functional change from before. 2005-10-12 11:55:56 +00:00
Ton Roosendaal
bcbaffc8c2 Look, in one commit!
- test build alpha splash
- version update to 239 in code
- release names are 2.40-alpha1

Note about release names; this is really an alpha still, not a release
candidate, so cannot call it 2.40-pre either.
Naming conventions is a discussion still... hope this works as a compromise
for now.
2005-10-11 14:04:57 +00:00
Nils Thuerey
328eeaf10b - added option to switch off compiling elbeem to scons files (set USE_FLUIDSIM=true)
in this case only the new blenderdummy.cpp and utilities.cpp have to be compiled
- restructured gui:
   * domain options split up into 2 sections
	 * added compressibility and refinement settings
	 * added inflow/outflow object types
- increased progress bar by 1
2005-10-10 06:59:47 +00:00
Jens Ole Wund
b9e6e0c2ec make compiling with free ms vc7 toolkit easier
hum .. do we need that ODBC .. looks like no
2005-10-08 22:40:58 +00:00
Jean-Luc Peurière
0006f8ad14 update to xcode
added a workaround for scons
2005-08-12 21:41:22 +00:00
Jean-Luc Peurière
b12f801681 updates to the OS X build system :
- XCode project
- Scons :
    scons stopped working for Os X in the last month (dont know when) :

     * the '.' and '..' keywords in CCPPATH
          are not recognized anymore for sconscripts compiling files at
          a sub level
     * when doing a scons clean, the 3 subdirs in build dir are removed
      and scons then fail to recreate them (exten, intern, source)

this commit solve the first problem as a temp workaround
for the latter simply recreate the dirs manually

I will investigate that further when on vacations,  which i should already
 be.
 ;(

all 3 build systems are now working on Os X
2005-08-04 16:05:28 +00:00
Simon Clitherow
671235b69b Finalised support for compiling BULLET on linux.
Bullet is now off by default on all platforms until we get an OK
from Erwin. To enable it, change USE_PHYSICS to 'bullet' in your
config.opts.
2005-08-02 18:54:11 +00:00
D.J. Capelis
fc5eca101b Modifications for bullet were made and variables were defined only for windows. This commit defines these variables for the other blender platforms helping SCons not to barf quite as quickly. Scons is still unable to compile a fresh CVS checkout at the present time on linux, but now at least allows config.opts to be properly created.
The new defines for use_bullet are currently set as false until testing can take place to ensure proper compilation on those systems.  The existing use_bullet='true' on the windows platform was left untouched.

Please ensure that variables are defined on _all_ platforms in the future instead of just defining them for the system you're currently developing under.
2005-08-02 12:40:52 +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
Johnny Matthews
aa3a45ddfc Linking to wrong zlib library. fixed! 2005-07-28 18:50:39 +00:00
Johnny Matthews
0f3303b7c5 Fix for zlib with MSVC/SCONS. Should compile now. This does not fix the bullet issues yet. But with this Blender should compile without the gameengine. 2005-07-28 18:11:10 +00:00
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