From: Carl Hetherington <cth@carlh.net>
Date: Sat, 22 Dec 2012 13:13:40 +0000 (+0000)
Subject: Fix a couple of python bits that python3 doesn't like.
X-Git-Tag: v2.0.48~1365
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=6e2ee564f38f2fa924f1d1c4fb95391cdee63bb6;p=dcpomatic.git

Fix a couple of python bits that python3 doesn't like.
---

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
diff --git a/wscript b/wscript
index 33e4d6d03..0957fdb39 100644
--- 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'])