2007-03-24 07:10:57 +00:00
|
|
|
#!/usr/bin/python
|
|
|
|
|
Import ('env')
|
|
|
|
|
|
|
|
|
|
sources = env.Glob('intern/*.c')
|
2011-09-05 21:01:50 +00:00
|
|
|
cmpsources = env.Glob('composite/*.c') + env.Glob('composite/nodes/*.c')
|
|
|
|
|
shdsources = env.Glob('shader/*.c') + env.Glob('shader/nodes/*.c')
|
|
|
|
|
texsources = env.Glob('texture/*.c') + env.Glob('texture/nodes/*.c')
|
2007-03-24 18:41:54 +00:00
|
|
|
incs = '. ./intern '
|
2011-09-05 21:01:50 +00:00
|
|
|
incs += './composite ./shader ./texture '
|
2007-12-27 22:16:54 +00:00
|
|
|
incs += '#/intern/guardedalloc ../editors/include ../blenlib ../makesdna'
|
2009-07-21 20:05:16 +00:00
|
|
|
incs += ' ../render/extern/include ../makesrna '
|
2007-03-24 07:10:57 +00:00
|
|
|
incs += ' ../imbuf ../avi '
|
2008-11-11 14:14:22 +00:00
|
|
|
incs += ' ../blenloader'
|
2011-11-09 15:00:11 +00:00
|
|
|
incs += ' ../blenfont ../blenkernel ../renderconverter '
|
Merge of first part of changes from the apricot branch, especially
the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:
* GLSL support in the viewport and game engine, enable in the game
menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.
* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
An extra texture slot shows up once the last slot is used.
* Memory limit for undo, not enabled by default yet because it
needs the .B.blend to be changed.
* Multiple undo for image painting.
* An offset for dupligroups, so not all objects in a group have to
be at the origin.
2008-09-04 20:51:28 +00:00
|
|
|
incs += ' ../gpu #/extern/glew/include '
|
____
`````|````` | | | ..''''
| | | |______ .''
| | | | ..'
| | |_______ |___________ ....''
merge to TRUNK!
* The old compositor is still available (Debug Menu: 200)
This commit was brought to you by:
Developers:
* Monique Dewanchand
* Jeroen Bakker
* Dalai Felinto
* Lukas Tönne
Review:
* Brecht van Lommel
Testers:
* Nate Wiebe
* Wolfgang Faehnle
* Carlo Andreacchio
* Daniel Salazar
* Artur Mag
* Christian Krupa
* Francesco Siddi
* Dan McGrath
* Bassam Kurdali
But mostly by the community:
Gold:
Joshua Faulkner
Michael Tiemann
Francesco Paglia
Blender Guru
Blender Developers Fund
Silver:
Pablo Vazquez
Joel Heethaar
Amrein Olivier
Ilias Karasavvidis
Thomas Kumlehn
Sebastian Koenig
Hannu Hoffrén
Benjamin Dansie
Fred M'ule
Michel Vilain
Bradley Cathey
Gianmichele Mariani
Gottfried Hofmann
Bjørnar Frøyse
Valentijn Bruning
Paul Holmes
Clemens Rudolph
Juris Graphix
David Strebel
Ronan Zeegers
François Tarlier
Felipe Andres Esquivel Reed
Olaf Beckman
Jesus Alberto Olmos Linares
Kajimba
Maria Figueiredo
Alexandr Galperin
Francesco Siddi
Julio Iglesias Lopez
Kjartan Tysdal
Thomas Torfs
Film Works
Teruyuki Nakamura
Roger Luethi
Benoit Bolsee
Stefan Abrahamsen
Andreas Mattijat
Xavier Bouchoux
Blender 3D Graphics and Animation
Henk Vostermans
Daniel Blanco Delgado
BlenderDay/2011
Bradley Cathey
Matthieu Dupont de Dinechin
Gianmichele Mariani
Jérôme Scaillet
Bronze (Ivo Grigull, Dylan Urquidi, Philippe Derungs, Phil Beauchamp, Bruce Parrott, Mathieu Quiblier, Daniel Martinez, Leandro Inocencio, Lluc Romaní Brasó,
Jonathan Williamson, Michael Ehlen, Karlis Stigis, Dreamsteep, Martin Lindelöf, Filippo Saracino, Douwe van der Veen, Olli Äkräs, Bruno D'Arcangeli,
Francisco Sedrez Warmling, Watchmike.ca, peter lener, Matteo Novellino, Martin Kirsch, Austars Schnore, KC Elliott, Massimiliano Puliero, Karl Stein,
Wood Design Studios, Omer Khan, Jyrki Kanto, Michał Krupa, Lars Brubaker, Neil Richmond, Adam Kalisz, Robert Garlington, Ian Wilson, Carlo Andreacchio,
Jeremias Boos, Robert Holcomb, Gabriel Zöller, Robert Cude, Natibel de Leon, Nathan Turnage, Nicolas Vergnes, Philipp Kleinhenz, Norman Hartig, Louis Kreusel,
Christopher Taylor, Giovanni Remondini, Daniel Rentzsch, Nico Partipilo, Thomas Ventresco, Johannes Schwarz, Александр Коротеев, Brendon Harvey,
Marcelo G. Malheiros, Marius Giurgi, Richard Burns, Perttu Iso-Metsälä, Steve Bazin, Radoslav Borisov, Yoshiyuki Shida, Julien Guigner, Andrew Hunter,
Philipp Oeser, Daniel Thul, Thobias Johansson, Mauro Bonecchi, Georg Piorczynski, Sebastian Michailidis, L M Weedy, Gen X, Stefan Hinze, Nicolò Zubbini,
Erik Pusch, Rob Scott, Florian Koch, Charles Razack, Adrian Baker, Oliver Villar Diz, David Revoy, Julio Iglesias Lopez, Coen Spoor, Carlos Folch,
Joseph Christie, Victor Hernández García, David Mcsween, James Finnerty, Cory Kruckenberg, Giacomo Graziosi, Olivier Saraja, Lars Brubaker, Eric Hudson,
Johannes Schwarz, David Elguea, Marcus Schulderinsky, Karel De Bruijn, Lucas van Wijngaarden, Stefano Ciarrocchi, Mehmet Eribol, Thomas Berglund, Zuofei Song,
Dylan Urquidi )
2012-05-17 12:49:33 +00:00
|
|
|
incs += ' ../compositor '
|
2007-03-24 18:41:54 +00:00
|
|
|
|
2007-03-24 07:10:57 +00:00
|
|
|
incs += ' ' + env['BF_OPENGL_INC']
|
|
|
|
|
incs += ' ' + env['BF_ZLIB_INC']
|
|
|
|
|
|
2009-04-20 15:06:46 +00:00
|
|
|
defs = []
|
2007-03-24 07:10:57 +00:00
|
|
|
|
2008-11-11 14:14:22 +00:00
|
|
|
if env['WITH_BF_PYTHON']:
|
2010-08-29 20:52:05 +00:00
|
|
|
incs += ' ' + env['BF_PYTHON_INC']
|
|
|
|
|
incs += ' ../python'
|
2010-10-31 04:11:39 +00:00
|
|
|
defs.append('WITH_PYTHON')
|
2010-08-29 20:52:05 +00:00
|
|
|
if env['BF_DEBUG']:
|
|
|
|
|
defs.append('_DEBUG')
|
2008-10-28 18:47:13 +00:00
|
|
|
|
2012-03-17 12:07:58 +00:00
|
|
|
if env['WITH_BF_INTERNATIONAL']:
|
|
|
|
|
defs.append('WITH_INTERNATIONAL')
|
|
|
|
|
|
2011-08-21 13:31:46 +00:00
|
|
|
if env['OURPLATFORM'] == 'linux':
|
2010-08-29 20:52:05 +00:00
|
|
|
cflags='-pthread'
|
2010-08-29 21:38:59 +00:00
|
|
|
incs += ' ../../../extern/binreloc/include'
|
2009-10-01 16:32:33 +00:00
|
|
|
|
2012-04-24 12:57:58 +00:00
|
|
|
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
|
2010-08-29 20:52:05 +00:00
|
|
|
incs += ' ' + env['BF_PTHREADS_INC']
|
2009-10-01 16:32:33 +00:00
|
|
|
|
2009-09-05 01:58:02 +00:00
|
|
|
env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [190,105] )
|
|
|
|
|
env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
|
|
|
|
|
env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
|
|
|
|
|
env.BlenderLib ( libname = 'bf_texnodes', sources = texsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
|