diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-09 13:35:10 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-09 13:35:10 +0000 |
| commit | 2385a5c4e83295921ec10e59bb2b2b66a492bb47 (patch) | |
| tree | 8ab2f0d787fa89f8cff5c0f93de0c228f931ca96 /src | |
| parent | 6f39875e07907cb136485649b9fbe4da73d9aae7 (diff) | |
| parent | 4b27d4bc0f0ac7fbe944f67d44ca4e71c2ba58e5 (diff) | |
Fix merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/wscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/wscript b/src/tools/wscript index c8601ad1f..58dfa9544 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -1,7 +1,7 @@ def build(bld): for t in ['makedcp', 'fixlengths', 'servomatic_cli']: obj = bld(features = 'cxx cxxprogram') - obj.uselib = 'BOOST_THREAD DCP' + obj.uselib = 'BOOST_THREAD OPENJPEG DCP AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC' obj.includes = ['..'] obj.use = ['libdvdomatic'] obj.source = '%s.cc' % t @@ -10,7 +10,7 @@ def build(bld): if not bld.env.DISABLE_GUI: for t in ['dvdomatic', 'servomatic_gui']: obj = bld(features = 'cxx cxxprogram') - obj.uselib = 'DCP' + obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC' obj.includes = ['..'] obj.use = ['libdvdomatic', 'libdvdomatic-wx'] obj.source = '%s.cc' % t |