summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-08-04 15:46:53 +0100
committerCarl Hetherington <cth@carlh.net>2012-08-04 15:46:53 +0100
commit29ec724e75f11e6e20997cbeaa7c2519c11cfda2 (patch)
treef2c0bc1bcbb234454455d46d09a00b5d83785869 /wscript
parente0e7f9f5dc1360e836db4c785f1a563dffeb2e44 (diff)
Update README a bit.
Diffstat (limited to 'wscript')
-rw-r--r--wscript4
1 files changed, 0 insertions, 4 deletions
diff --git a/wscript b/wscript
index 1996b9db1..48f189073 100644
--- a/wscript
+++ b/wscript
@@ -13,7 +13,6 @@ def options(opt):
opt.add_option('--enable-debug', action='store_true', default = False, help = 'build with debugging information and without optimisation')
opt.add_option('--disable-gui', action='store_true', default = False, help = 'disable building of GUI tools')
opt.add_option('--disable-player', action='store_true', default = False, help = 'disable building of the player components')
- opt.add_option('--ffmpeg-083', action='store_true', default = False, help = 'Use FFmpeg version in Ubuntu 12.04')
opt.add_option('--target-windows', action='store_true', default = False, help = 'set up to do a cross-compile to Windows')
def configure(conf):
@@ -52,9 +51,6 @@ def configure(conf):
else:
conf.env.append_value('CXXFLAGS', '-O3')
- if conf.options.ffmpeg_083:
- conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_FFMPEG_0_8_3')
-
conf.check_cfg(package = 'sigc++-2.0', args = '--cflags --libs', uselib_store = 'SIGC++', mandatory = True)
conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True)
conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True)