Changeset c0fe2a9


Ignore:
Timestamp:
Oct 15, 2013, 7:07:15 PM (6 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, pitchshift, sampler, timestretch, yinfft+
Children:
47e067b
Parents:
d770fd2 (diff), 0c77921 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'device' into develop

Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • src/aubio.h

    rd770fd2 rc0fe2a9  
    185185#include "io/source.h"
    186186#include "io/sink.h"
     187#include "io/audio_unit.h"
    187188#include "synth/sampler.h"
    188189
  • src/wscript_build

    rd770fd2 rc0fe2a9  
    1212# build libaubio
    1313from waflib import Options
    14 if Options.platform == 'ios': build_lib_func = ctx.stlib
    15 else: build_lib_func = ctx.shlib
     14if Options.platform in ['ios', 'iosimulator']:
     15    build_lib_func = ctx.stlib
     16else:
     17    build_lib_func = ctx.shlib
     18
    1619build_lib_func(
    1720    includes = ['.'],
     
    2528# install headers, except _priv.h ones
    2629ctx.install_files('${PREFIX}/include/aubio/',
    27 
    2830    ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']),
    2931    relative_trick=True)
  • wscript

    rd770fd2 rc0fe2a9  
    8787    ctx.define('HAVE_ACCELERATE', 1)
    8888
    89   if Options.platform == 'ios':
     89  if Options.platform in [ 'ios', 'iosimulator' ]:
    9090    ctx.env.CC = 'clang'
    9191    ctx.env.LD = 'clang'
    9292    ctx.env.LINK_CC = 'clang'
     93    ctx.define('HAVE_ACCELERATE', 1)
     94    ctx.define('TARGET_OS_IPHONE', 1)
     95    ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox', 'Accelerate']
    9396    SDKVER="7.0"
    94     DEVROOT="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer"
    95     SDKROOT="%(DEVROOT)s/SDKs/iPhoneOS%(SDKVER)s.sdk" % locals()
    96     ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox', 'Accelerate']
    97     ctx.define('HAVE_ACCELERATE', 1)
    98     ctx.env.CFLAGS += [ '-miphoneos-version-min=6.1', '-arch', 'armv7',
    99             '--sysroot=%s' % SDKROOT]
    100     ctx.env.LINKFLAGS += ['-std=c99', '-arch', 'armv7', '--sysroot=%s' %
    101             SDKROOT]
     97    MINSDKVER="6.1"
     98    if Options.platform == 'ios':
     99        DEVROOT="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer"
     100        SDKROOT="%(DEVROOT)s/SDKs/iPhoneOS%(SDKVER)s.sdk" % locals()
     101        ctx.env.CFLAGS += [ '-arch', 'armv7' ]
     102        ctx.env.CFLAGS += [ '-arch', 'armv7s' ]
     103        ctx.env.LINKFLAGS += ['-arch', 'armv7']
     104        ctx.env.LINKFLAGS += ['-arch', 'armv7s']
     105    else:
     106        DEVROOT="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer"
     107        SDKROOT="%(DEVROOT)s/SDKs/iPhoneSimulator%(SDKVER)s.sdk" % locals()
     108        ctx.env.CFLAGS += [ '-arch', 'i386' ]
     109        ctx.env.LINKFLAGS += ['-arch', 'i386']
     110        ctx.env.CFLAGS += [ '-arch', 'x86_64' ]
     111        ctx.env.LINKFLAGS += ['-arch', 'x86_64']
     112    ctx.env.CFLAGS += [ '-miphoneos-version-min=' + MINSDKVER ]
     113    ctx.env.CFLAGS += [ '--sysroot=%s' % SDKROOT]
     114    ctx.env.CFLAGS += ['-std=c99']
     115    ctx.env.LINKFLAGS += ['-std=c99']
     116    ctx.env.LINKFLAGS += ['--sysroot=%s' % SDKROOT]
    102117
    103118  # check for required headers
     
    192207  bld.recurse('src')
    193208  from waflib import Options
    194   if Options.platform != 'ios':
     209  if Options.platform not in ['ios', 'iosimulator']:
    195210      bld.recurse('examples')
    196211      bld.recurse('tests')
     
    226241def shutdown(bld):
    227242    from waflib import Options, Logs
    228     if Options.platform == 'ios':
     243    if Options.platform in ['ios', 'iosimulator']:
    229244          msg ='aubio built for ios, contact the author for a commercial license'
    230245          Logs.pprint('RED', msg)
Note: See TracChangeset for help on using the changeset viewer.