Fix off-by-one in ASSERT and make it more comprehensive.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index bee03cb0cc1d94a4f856546124940e5e5c19545b..72db83e2cc638ada4377d2f7dd6b62001518cdbf 100644 (file)
--- a/wscript
+++ b/wscript
@@ -106,6 +106,7 @@ def configure(conf):
                                        '-Wall',
                                        '-Wextra',
                                        '-Wwrite-strings',
+                                       '-Wsign-conversion',
                                        # Remove auto_ptr warnings from libxml++-2.6
                                        '-Wno-deprecated-declarations',
                                        '-Wno-ignored-qualifiers',
@@ -199,8 +200,6 @@ def configure(conf):
         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')
-        if not conf.env.DISABLE_GUI:
-            conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
 
     # OSX
     if conf.env.TARGET_OSX:
@@ -394,8 +393,9 @@ def configure(conf):
     if conf.options.enable_disk:
         if conf.check_cfg(package='nanomsg', args='--cflags --libs', uselib_store='NANOMSG', mandatory=False) is None:
             conf.check_cfg(package='libnanomsg', args='--cflags --libs', uselib_store='NANOMSG', mandatory=True)
-        # We link with nanomsg statically on Centos 8 so we need to link this as well
-        conf.env.LIB_NANOMSG.append('anl')
+        if conf.env.TARGET_LINUX:
+            # We link with nanomsg statically on Centos 8 so we need to link this as well
+            conf.env.LIB_NANOMSG.append('anl')
 
     # FFmpeg
     if conf.options.static_ffmpeg: