Fix a couple of python bits that python3 doesn't like.
authorCarl Hetherington <cth@carlh.net>
Sat, 22 Dec 2012 13:13:40 +0000 (13:13 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 22 Dec 2012 13:13:40 +0000 (13:13 +0000)
src/tools/wscript
wscript

index af07abdcd99d0a8ff586086fd3985364845083a0..5a837f8450b57aaa4b3371641503c666d3e6071d 100644 (file)
@@ -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
diff --git a/wscript b/wscript
index 33e4d6d03489ce7ebffb85b82edd5222b381ea28..0957fdb39f47c7f94300f12e33d5927268a478da 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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'])