diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-22 13:13:40 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-22 13:13:40 +0000 |
| commit | 6e2ee564f38f2fa924f1d1c4fb95391cdee63bb6 (patch) | |
| tree | 6f20c6cb6ed51423f7773d90e1021cd8baf25985 | |
| parent | d7561eabc79d700e13e592984effba8da5fc7fdd (diff) | |
Fix a couple of python bits that python3 doesn't like.
| -rw-r--r-- | src/tools/wscript | 4 | ||||
| -rw-r--r-- | wscript | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/wscript b/src/tools/wscript index af07abdcd..5a837f845 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -1,8 +1,8 @@ def build(bld): for t in ['makedcp', 'servomatic_cli']: obj = bld(features = 'cxx cxxprogram') - obj.uselib = 'BOOST_THREAD OPENJPEG DCP AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC' - obj.includes = ['..'] + obj.uselib = 'BOOST_THREAD OPENJPEG DCP AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC' + obj.includes = ['..'] obj.use = ['libdvdomatic'] obj.source = '%s.cc' % t obj.target = t @@ -24,7 +24,6 @@ def configure(conf): if conf.options.target_windows: conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE']) wxrc = os.popen('wx-config --rescomp').read().split()[1:] - print wxrc conf.env.append_value('WINRCFLAGS', wxrc) if conf.options.enable_debug: conf.env.append_value('CXXFLAGS', ['-mconsole']) |