X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=ae2e39bcfdb7794190dabaa3b84a8eacb7c87269;hb=68fa6e44a938d963129db758c25af8e843771a85;hp=c790ef9a409a328587663132c80e5e3fd3952bc2;hpb=5c0766f99bdf87dc755b40bc396be4dbf1d0bc69;p=libdcp.git

diff --git a/wscript b/wscript
index c790ef9a..ae2e39bc 100644
--- a/wscript
+++ b/wscript
@@ -1,19 +1,20 @@
 #
 #    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 #
-#    This program is free software; you can redistribute it and/or modify
+#    This file is part of libdcp.
+#
+#    libdcp is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation; either version 2 of the License, or
 #    (at your option) any later version.
 #
-#    This program is distributed in the hope that it will be useful,
+#    libdcp is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import subprocess
@@ -23,7 +24,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'libdcp'
-VERSION = '1.3.0devel'
+VERSION = '1.3.3devel'
 API_VERSION = '-1.0'
 
 def options(opt):
@@ -39,6 +40,9 @@ def options(opt):
 def configure(conf):
     conf.load('compiler_cxx')
     conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS'])
+    gcc = conf.env['CC_VERSION']
+    if int(gcc[0]) >= 4 and int(gcc[1]) > 1:
+        conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized'])
     conf.env.append_value('CXXFLAGS', ['-DLIBDCP_VERSION="%s"' % VERSION])
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows
@@ -57,8 +61,11 @@ def configure(conf):
     if conf.env.TARGET_OSX:
         conf.env.append_value('CXXFLAGS', ['-Wno-unused-result', '-Wno-unused-parameter', '-Wno-unused-local-typedef'])
 
+    # Disable libxml++ deprecation warnings for now
+    conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-declarations'])
+
     if conf.options.enable_openmp:
-        conf.env.append_value('CXXFLAGS', '-fopenmp')
+        conf.env.append_value('CXXFLAGS', ['-fopenmp', '-DLIBDCP_OPENMP'])
         conf.env.LIB_OPENMP = ['gomp']
 
     conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)