Changeset 19ddbf3


Ignore:
Timestamp:
Nov 13, 2013, 1:12:33 AM (11 years ago)
Author:
Paul Brossier <piem@piem.org>
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:
54e74f0
Parents:
4dd7816
Message:

wscript: set DEST_OS, use -isysroot and -mios-simulator-version-min

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • src/wscript_build

    r4dd7816 r19ddbf3  
    1111
    1212# build libaubio
    13 from waflib import Options
    14 if Options.platform in ['ios', 'iosimulator']:
     13if ctx.env['DEST_OS'] in ['ios', 'iosimulator']:
    1514    build_lib_func = ctx.stlib
    1615else:

  • wscript

    r4dd7816 r19ddbf3  
    7777  if Options.options.target_platform:
    7878    Options.platform = Options.options.target_platform
     79    ctx.env['DEST_OS'] = Options.platform
    7980
    8081  if Options.platform == 'win32':
    … …  
    8889
    8990  if Options.platform in [ 'ios', 'iosimulator' ]:
    90     ctx.env.CC = 'clang'
    91     ctx.env.LD = 'clang'
    92     ctx.env.LINK_CC = 'clang'
    9391    ctx.define('HAVE_ACCELERATE', 1)
    9492    ctx.define('TARGET_OS_IPHONE', 1)
    … …  
    9694    SDKVER="7.0"
    9795    MINSDKVER="6.1"
     96    ctx.env.CFLAGS += ['-std=c99']
    9897    if Options.platform == 'ios':
    9998        DEVROOT="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer"
    … …  
    103102        ctx.env.LINKFLAGS += ['-arch', 'armv7']
    104103        ctx.env.LINKFLAGS += ['-arch', 'armv7s']
     104        ctx.env.CFLAGS += [ '-miphoneos-version-min=' + MINSDKVER ]
     105        ctx.env.LINKFLAGS += [ '-miphoneos-version-min=' + MINSDKVER ]
    105106    else:
    106107        DEVROOT="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer"
    … …  
    108109        ctx.env.CFLAGS += [ '-arch', 'i386' ]
    109110        ctx.env.LINKFLAGS += ['-arch', 'i386']
    110     ctx.env.CFLAGS += [ '-miphoneos-version-min=' + MINSDKVER ]
    111     ctx.env.CFLAGS += [ '--sysroot=%s' % SDKROOT]
    112     ctx.env.CFLAGS += ['-std=c99']
    113     ctx.env.LINKFLAGS += ['-std=c99']
    114     ctx.env.LINKFLAGS += ['--sysroot=%s' % SDKROOT]
     111        ctx.env.CFLAGS += [ '-mios-simulator-version-min=' + MINSDKVER ]
     112        ctx.env.LINKFLAGS += [ '-mios-simulator-version-min=' + MINSDKVER ]
     113    ctx.env.CFLAGS += [ '-isysroot' , SDKROOT]
     114    ctx.env.LINKFLAGS += [ '-isysroot' , SDKROOT]
    115115
    116116  # check for required headers
    … …  
    204204  # add sub directories
    205205  bld.recurse('src')
    206   from waflib import Options
    207   if Options.platform not in ['ios', 'iosimulator']:
     206  if bld.env['DEST_OS'] not in ['ios', 'iosimulator']:
    208207      bld.recurse('examples')
    209208      bld.recurse('tests')
Note: See TracChangeset for help on using the changeset viewer.