Merge.
authorCarl Hetherington <cth@carlh.net>
Thu, 20 Apr 2017 09:42:35 +0000 (10:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 20 Apr 2017 09:42:35 +0000 (10:42 +0100)
1  2 
cscript

diff --cc cscript
index d22f7d38b815c2b1c6c0766bef2b6dc4703b7c89,2b46e963f267775b1754bd2d7d649de62bca8b24..764010e4efdc42f102a1f22fb6df4be0f0823e04
+++ b/cscript
@@@ -23,9 -22,7 +23,9 @@@ def build(target, options)
      if target.debug:
          cmd += '--enable-debug '
      if target.platform == 'linux':
-         cmd += '%s --with-pulse --with-alsa'
+         cmd += '--with-pulse --with-alsa'
 +        if target.distro == 'debian' and target.version == '8' and target.bits == 32:
 +            environment = 'LDFLAGS=-lpulse'
      elif target.platform == 'windows':
          target.append_with_space('CXXFLAGS', '-Iinclude')
          cmd += '--with-wasapi --with-ds --host=%s-w64-mingw32' % target.mingw_name