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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | source/blender/src/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile index d3b1240a671..a037beb015f 100644 --- a/source/blender/src/Makefile +++ b/source/blender/src/Makefile @@ -81,10 +81,10 @@ CPPFLAGS += -I../radiosity/extern/include CPPFLAGS += -I$(SRCHOME)/gameengine/Physics/Sumo/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +CPPFLAGS += -I$(NAN_MEMUTIL)/include CPPFLAGS += -I$(NAN_DECIMATION)/include CPPFLAGS += -I$(NAN_BSP)/include - CPPFLAGS += -I$(NAN_OPENNL)/include CPPFLAGS += -I../readstreamglue @@ -111,6 +111,10 @@ ifeq ($(WITH_QUICKTIME),true) CPPFLAGS += -DWITH_QUICKTIME endif +ifeq ($(WITH_FFMPEG),true) + CPPFLAGS += -DWITH_FFMPEG +endif + ifeq ($(WITH_OPENEXR),true) CPPFLAGS += -DWITH_OPENEXR endif |