Changes in / [db120ac:6bbdcff]

Files:

• src/aubio.h (modified) (1 diff)
• src/io/audio_unit.c (deleted)
• src/io/audio_unit.h (deleted)
• src/wscript_build (modified) (2 diffs)
• wscript (modified) (1 diff)

src/aubio.h

@@ -185 +185 @@
 #include "io/source.h"
 #include "io/sink.h"
-#include "io/audio_unit.h"
 #include "synth/sampler.h"
 

src/wscript_build

@@ -16 +16 @@
 # build libaubio
 from waflib import Options
-if Options.platform == 'ios':
-    build_lib_func = ctx.stlib
-else:
-    build_lib_func = ctx.shlib
-
+if Options.platform == 'ios': build_lib_func = ctx.stlib
+else: build_lib_func = ctx.shlib
 build_lib_func(
     includes = ['.'],
@@ -27 +24 @@
     lib = 'm',
     uselib = uselib,
-    install_path = '${PREFIX}/lib',
     vnum = ctx.env['LIB_VERSION'])
 
 # install headers, except _priv.h ones
 ctx.install_files('${PREFIX}/include/aubio/',
+
     ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']),
     relative_trick=True)

wscript

@@ -78 +78 @@
     ctx.env.LD = 'clang'
     ctx.env.LINK_CC = 'clang'
-    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',
+    ctx.env.CFLAGS += [ '-miphoneos-version-min=6.1', '-arch', 'armv7',
             '--sysroot=%s' % SDKROOT]
-    ctx.env.LINKFLAGS += ['-std=c99', '-arch', 'armv7', '-arch', 'armv7s', '--sysroot=%s' %
+    ctx.env.LINKFLAGS += ['-std=c99', '-arch', 'armv7', '--sysroot=%s' %
             SDKROOT]