- Timestamp:
- Oct 15, 2013, 7:07:15 PM (11 years ago)
- Branches:
- feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified wscript ¶
rd770fd2 rc0fe2a9 87 87 ctx.define('HAVE_ACCELERATE', 1) 88 88 89 if Options.platform == 'ios':89 if Options.platform in [ 'ios', 'iosimulator' ]: 90 90 ctx.env.CC = 'clang' 91 91 ctx.env.LD = 'clang' 92 92 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'] 93 96 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] 102 117 103 118 # check for required headers … … 192 207 bld.recurse('src') 193 208 from waflib import Options 194 if Options.platform != 'ios':209 if Options.platform not in ['ios', 'iosimulator']: 195 210 bld.recurse('examples') 196 211 bld.recurse('tests') … … 226 241 def shutdown(bld): 227 242 from waflib import Options, Logs 228 if Options.platform == 'ios':243 if Options.platform in ['ios', 'iosimulator']: 229 244 msg ='aubio built for ios, contact the author for a commercial license' 230 245 Logs.pprint('RED', msg)
Note: See TracChangeset
for help on using the changeset viewer.