Merge branch 'mine/master'

Conflicts:
	mixer/wscript
	wscript

mixer/wscript

@@ -65,7 +65,8 @@ src/main.C
               target       = 'non-mixer',
               includes     = ['.', 'src', '../FL', '../nonlib'],
               use = ['nonlib', 'fl_widgets'],
-              uselib = [ 'JACK', 'LIBLO', 'LRDF', 'XPM', 'NTK', 'NTK_IMAGES', 'PTHREAD' ],
+              uselib = [ 'JACK', 'LIBLO', 'LRDF', 'XPM', 'NTK', 'NTK_IMAGES',
+                  'DL', 'PTHREAD' ],
               install_path = '${BINDIR}')
 
     bld( features = 'subst',

wscript

@@ -67,6 +67,8 @@ def configure(conf):
     conf.env.append_value('CXXFLAGS', global_flags )
 
     conf.env['LIB_PTHREAD'] = ['pthread']
+    conf.env['LIB_DL'] = ['dl']
+    conf.env['LIB_M'] = ['m']
 
     # NTK_EXTRA_FLAGS=''
     # if not Options.options.use_system_ntk: