Revert some of the Linux stuff from a few commits ago.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index b1e2096d4989df154f10164339cf51e55fe1f008..00665bbacfdf7469a3276360bec21c4bb6b3f4ae 100644 (file)
--- a/wscript
+++ b/wscript
@@ -123,6 +123,8 @@ def configure(conf):
             # I tried and failed to ignore these with _Pragma
             conf.env.append_value('CXXFLAGS', ['-Wno-cast-function-type'])
         have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
+        # Most gccs still give these warnings from boost::optional
+        conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized'])
     else:
         have_c11 = False
 
@@ -196,18 +198,15 @@ def configure(conf):
     if conf.env.TARGET_LINUX:
         conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
         conf.env.append_value('CXXFLAGS', '-DLINUX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX'])
-        conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share/dcpomatic2"' % conf.env['INSTALL_PREFIX'])
+        conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share"' % conf.env['INSTALL_PREFIX'])
         conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
         conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align'])
         conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl')
 
     # OSX
     if conf.env.TARGET_OSX:
-        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-Wno-unused-function', '-Wno-unused-parameter', '-Wno-unused-local-typedef', '-Wno-potentially-evaluated-expression'])
+        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX'])
         conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names')
-    else:
-        # Avoid the endless warnings about _t uninitialized in optional<>
-        conf.env.append_value('CXXFLAGS', '-Wno-maybe-uninitialized')
 
     #
     # Dependencies.
@@ -552,6 +551,7 @@ def configure(conf):
                                 #include <boost/process.hpp>\n
                                 int main() { new boost::process::child("foo"); }\n
                                 """,
+                           cxxflags='-Wno-unused-parameter',
                            msg='Checking for boost process library',
                            lib=deps,
                            uselib_store='BOOST_PROCESS')