merge with develop

diff --cc src/aubio.h
Simple merge

diff --cc src/wscript_build
Simple merge

diff --cc wscript
index ea680ea,8f218a9..0fe4229
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -69,22 -71,21 +69,37 @@@ def configure(ctx)
      ctx.env.LINKFLAGS += ['-arch', 'i386', '-arch', 'x86_64']
      ctx.env.CC = 'llvm-gcc-4.2'
      ctx.env.LINK_CC = 'llvm-gcc-4.2'
 -    ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox']
 +    ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox', 'Accelerate']
 +    ctx.define('HAVE_ACCELERATE', 1)
  
--  if Options.platform == 'ios':
++  if Options.platform in [ 'ios', 'iosimulator' ]:
      ctx.env.CC = 'clang'
      ctx.env.LD = 'clang'
      ctx.env.LINK_CC = 'clang'
-     SDKVER="7.0"
-     DEVROOT="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer"
-     SDKROOT="%(DEVROOT)s/SDKs/iPhoneOS%(SDKVER)s.sdk" % locals()
-     ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox', 'Accelerate']
 +    ctx.define('HAVE_ACCELERATE', 1)
-     ctx.env.CFLAGS += [ '-miphoneos-version-min=6.1', '-arch', 'armv7',
-             '--sysroot=%s' % SDKROOT]
-     ctx.env.LINKFLAGS += ['-std=c99', '-arch', 'armv7', '--sysroot=%s' %
-             SDKROOT]
+     ctx.define('TARGET_OS_IPHONE', 1)
 -    SDKVER="6.1"
 -    DEVROOT="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer"
 -    SDKROOT="%(DEVROOT)s/SDKs/iPhoneOS%(SDKVER)s.sdk" % locals()
 -    ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox']
 -    ctx.env.CFLAGS += [ '-miphoneos-version-min=6.1', '-arch', 'armv7', '-arch', 'armv7s',
 -            '--sysroot=%s' % SDKROOT]
 -    ctx.env.LINKFLAGS += ['-std=c99', '-arch', 'armv7', '-arch', 'armv7s', '--sysroot=%s' %
 -            SDKROOT]
++    ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox', 'Accelerate']
++    SDKVER="7.0"
++    MINSDKVER="6.1"
++    if Options.platform == 'ios':
++        DEVROOT="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer"
++        SDKROOT="%(DEVROOT)s/SDKs/iPhoneOS%(SDKVER)s.sdk" % locals()
++        ctx.env.CFLAGS += [ '-arch', 'armv7' ]
++        ctx.env.CFLAGS += [ '-arch', 'armv7s' ]
++        ctx.env.LINKFLAGS += ['-arch', 'armv7']
++        ctx.env.LINKFLAGS += ['-arch', 'armv7s']
++    else:
++        DEVROOT="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer"
++        SDKROOT="%(DEVROOT)s/SDKs/iPhoneSimulator%(SDKVER)s.sdk" % locals()
++        ctx.env.CFLAGS += [ '-arch', 'i386' ]
++        ctx.env.LINKFLAGS += ['-arch', 'i386']
++        ctx.env.CFLAGS += [ '-arch', 'x86_64' ]
++        ctx.env.LINKFLAGS += ['-arch', 'x86_64']
++    ctx.env.CFLAGS += [ '-miphoneos-version-min=' + MINSDKVER ]
++    ctx.env.CFLAGS += [ '--sysroot=%s' % SDKROOT]
++    ctx.env.CFLAGS += ['-std=c99']
++    ctx.env.LINKFLAGS += ['-std=c99']
++    ctx.env.LINKFLAGS += ['--sysroot=%s' % SDKROOT]
  
    # check for required headers
    ctx.check(header_name='stdlib.h')
@@@ -177,41 -198,40 +192,41 @@@ def build(bld)
    # add sub directories
    bld.recurse('src')
    from waflib import Options
--  if Options.platform != 'ios':
++  if Options.platform not in ['ios', 'iosimulator']:
        bld.recurse('examples')
        bld.recurse('tests')
  
    """
 -  # create the aubio.pc file for pkg-config
 -  if ctx.env['TARGET_PLATFORM'] == 'linux':
 -    aubiopc = ctx.new_task_gen('subst')
 -    aubiopc.source = 'aubio.pc.in'
 -    aubiopc.target = 'aubio.pc'
 -    aubiopc.install_path = '${PREFIX}/lib/pkgconfig'
 +  # install woodblock sound
 +  bld.install_files('${PREFIX}/share/sounds/aubio/',
 +      'sounds/woodblock.aiff')
 +  """
 +
 +  bld( source = 'aubio.pc.in' )
  
    # build manpages from sgml files
 -  if ctx.env['DOCBOOKTOMAN']:
 -    import TaskGen
 +  if bld.env['DOCBOOKTOMAN']:
 +    from waflib import TaskGen
 +    if 'MANDIR' not in bld.env:
 +      bld.env['MANDIR'] = bld.env['PREFIX'] + '/share/man'
      TaskGen.declare_chain(
 -        name    = 'docbooktoman',
 -        rule    = '${DOCBOOKTOMAN} ${SRC} > ${TGT}',
 -        ext_in  = '.sgml',
 -        ext_out = '.1',
 -        reentrant = 0,
 +        name      = 'docbooktoman',
 +        rule      = '${DOCBOOKTOMAN} ${SRC} > ${TGT}',
 +        ext_in    = '.sgml',
 +        ext_out   = '.1',
 +        reentrant = False,
 +        install_path =  '${MANDIR}/man1',
      )
 -    manpages = ctx.new_task_gen(name = 'docbooktoman',
 -        source=ctx.path.ant_glob('doc/*.sgml'))
 -    ctx.install_files('${MANDIR}/man1', ctx.path.ant_glob('doc/*.1'))
 +    bld( source = bld.path.ant_glob('doc/*.sgml') )
  
 -  # install woodblock sound
 -  bld.install_files('${PREFIX}/share/sounds/aubio/',
 -      'sounds/woodblock.aiff')
 +  """
 +  bld(rule = 'doxygen ${SRC}', source = 'web.cfg') #, target = 'doc/web/index.html')
    """
  
 +
  def shutdown(bld):
      from waflib import Options, Logs
--    if Options.platform == 'ios':
++    if Options.platform in ['ios', 'iosimulator']:
            msg ='aubio built for ios, contact the author for a commercial license'
            Logs.pprint('RED', msg)
            msg ='   Paul Brossier <piem@aubio.org>'