X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=00665bbacfdf7469a3276360bec21c4bb6b3f4ae;hb=7e783c3ac62e1000775843234da5f8a78f50b6af;hp=4fba8fb570204b53c2e1fd6634248a830789df31;hpb=7399b5483c5b69559bbfcee27bfd415a967add85;p=dcpomatic.git

diff --git a/wscript b/wscript
index 4fba8fb57..00665bbac 100644
--- a/wscript
+++ b/wscript
@@ -108,7 +108,6 @@ def configure(conf):
                                        '-Wextra',
                                        '-Wwrite-strings',
                                        # I tried and failed to ignore these with _Pragma
-                                       '-Wno-cast-function-type',
                                        '-Wno-ignored-qualifiers',
                                        '-D_FILE_OFFSET_BITS=64'])
 
@@ -120,11 +119,12 @@ def configure(conf):
 
     if conf.env['CXX_NAME'] == 'gcc':
         gcc = conf.env['CC_VERSION']
-        if int(gcc[0]) >= 4 and int(gcc[1]) > 1:
-            conf.env.append_value('CXXFLAGS', ['-Wno-unused-result'])
-        if int(gcc[0]) >= 9:
-            conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-copy'])
+        if int(gcc[0]) >= 8:
+            # 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
 
@@ -198,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.
@@ -324,7 +321,7 @@ def configure(conf):
         if conf.options.workaround_gssapi:
             conf.env.LIB_SSH = ['gssapi_krb5']
     else:
-        conf.check_cc(fragment="""
+        conf.check_cxx(fragment="""
                                #include <libssh/libssh.h>\n
                                int main () {\n
                                ssh_new ();\n
@@ -503,7 +500,7 @@ def configure(conf):
 
         conf.check_cxx(fragment="""
     			    #include <boost/thread.hpp>\n
-    			    int main() { boost::thread t (); }\n
+			    int main() { boost::thread t; }\n
 			    """,
                        msg='Checking for boost threading library',
                        libpath='/usr/local/lib',
@@ -554,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')