diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-11-07 17:32:32 +0400 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-11-07 17:32:32 +0400 |
commit | a0286f42f91b3001486abb8999911ebac7560491 (patch) | |
tree | 78c95be820c410ca2d92bda764ba9363984b06ff /source/blender/blenloader/SConscript | |
parent | 56e283408ace8dec9add4fa32e8f40ddeac94a36 (diff) |
"Render Audio" cleanup:
* Removed audio-only options from ffmpeg render settings (added some versionning code too)!
* Moved the Mixdon button from the Scene->Audio pannel to the Render->Render panel.
Diffstat (limited to 'source/blender/blenloader/SConscript')
-rw-r--r-- | source/blender/blenloader/SConscript | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript index 3882cc1029a..bd002e59fa4 100644 --- a/source/blender/blenloader/SConscript +++ b/source/blender/blenloader/SConscript @@ -51,6 +51,9 @@ defs = [] if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') +if env['WITH_BF_FFMPEG']: + defs.append('WITH_FFMPEG') + if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): env.BlenderLib('bf_blenloader', sources, incs, defs, libtype=['core', 'player'], priority = [167, 30]) #, cc_compileflags=['/WX']) else: |