diff options
| author | Peter Schlaile <peter@schlaile.de> | 2006-02-05 22:30:37 +0300 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2006-02-05 22:30:37 +0300 |
| commit | 90f0e372637178de107dbe161f1e24561ef9513d (patch) | |
| tree | f7721f0c52eaef89e306f53514a35500d576015e /source/blender/src/SConscript | |
| parent | f17bdcb2e4da09caaeb53b0ca7d8e881d79f901e (diff) | |
* Adds configuration buttons for ffmpeg-output
* Large sequencer rewrite to support:
- Audio-tracks, which are not completely loaded into memory (hdaudio) but
kept on disk instead.
- A dependency tree, that builds only the Imbufs, that are really needed
- Cleaner sequencer code
- Per instance data in sequencer plugins (without this, the Dynamic
Noise Reduction plugin would be impossible)
- A Luma Waveform display
- A U/V scatter plot display
- Memcache limiting in sequencer
- Buttons changed according to the boosted framecount limit
Diffstat (limited to 'source/blender/src/SConscript')
| -rw-r--r-- | source/blender/src/SConscript | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript index 5f5f86ee573..4c9eb3b8a86 100644 --- a/source/blender/src/SConscript +++ b/source/blender/src/SConscript @@ -5,7 +5,8 @@ Import ('env') sources = env.Glob('*.c') -incs = ' #/intern/guardedalloc ../blenlib ../makesdna ../blenkernel' +incs = ' #/intern/guardedalloc #/intern/memutil' +incs += ' ../blenlib ../makesdna ../blenkernel' incs += ' ../include #/intern/bmfont ../imbuf ../render/extern/include' incs += ' #/intern/bsp/extern ../radiosity/extern/include' incs += ' #/intern/decimation/extern ../blenloader ../python' @@ -31,6 +32,9 @@ if env['WITH_BF_QUICKTIME']==1: incs += ' ' + env['BF_QUICKTIME_INC'] defs.append('WITH_QUICKTIME') +if env['WITH_BF_FFMPEG'] == 1: + defs += ' WITH_FFMPEG' + # TODO buildinfo if env['BF_BUILDINFO'] == 1: defs.append('NAN_BUILDINFO') |