Changeset b257b60 for wscript


Ignore:
Timestamp:
Aug 12, 2015, 7:21:38 PM (9 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:
60fc05b
Parents:
3a1a5d6 (diff), 7b2d740 (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 'develop' into notes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • wscript

    r3a1a5d6 rb257b60  
    118118    if target_platform in [ 'ios', 'iosimulator' ]:
    119119        ctx.define('TARGET_OS_IPHONE', 1)
    120         SDKVER="7.1"
    121120        MINSDKVER="6.1"
    122121        ctx.env.CFLAGS += ['-std=c99']
     
    124123            DEVROOT = "/Applications/Xcode.app/Contents"
    125124            DEVROOT += "/Developer/Platforms/iPhoneOS.platform/Developer"
    126             SDKROOT = "%(DEVROOT)s/SDKs/iPhoneOS%(SDKVER)s.sdk" % locals()
    127             #ctx.env.CFLAGS += [ '-arch', 'arm64' ]
     125            SDKROOT = "%(DEVROOT)s/SDKs/iPhoneOS.sdk" % locals()
     126            ctx.env.CFLAGS += [ '-arch', 'arm64' ]
    128127            ctx.env.CFLAGS += [ '-arch', 'armv7' ]
    129128            ctx.env.CFLAGS += [ '-arch', 'armv7s' ]
    130             #ctx.env.LINKFLAGS += [ '-arch', 'arm64' ]
     129            ctx.env.LINKFLAGS += [ '-arch', 'arm64' ]
    131130            ctx.env.LINKFLAGS += ['-arch', 'armv7']
    132131            ctx.env.LINKFLAGS += ['-arch', 'armv7s']
     
    136135            DEVROOT = "/Applications/Xcode.app/Contents"
    137136            DEVROOT += "/Developer/Platforms/iPhoneSimulator.platform/Developer"
    138             SDKROOT = "%(DEVROOT)s/SDKs/iPhoneSimulator%(SDKVER)s.sdk" % locals()
     137            SDKROOT = "%(DEVROOT)s/SDKs/iPhoneSimulator.sdk" % locals()
    139138            ctx.env.CFLAGS += [ '-arch', 'i386' ]
    140139            ctx.env.CFLAGS += [ '-arch', 'x86_64' ]
     
    180179        if (ctx.options.enable_fftw3f != False):
    181180            ctx.check_cfg(package = 'fftw3f', atleast_version = '3.0.0',
    182                     args = '--cflags --libs', mandatory = False)
     181                    args = '--cflags --libs',
     182                    mandatory = ctx.options.enable_fftw3f)
    183183            if (ctx.options.enable_double == True):
    184                 ctx.msg('Warning', 'fftw3f enabled, but compiling in double precision!')
     184                ctx.msg('Warning',
     185                        'fftw3f enabled, but compiling in double precision!')
    185186        else:
    186             # fftw3f not enabled, take most sensible one according to enable_double
     187            # fftw3f disabled, take most sensible one according to
     188            # enable_double
    187189            if (ctx.options.enable_double == True):
    188190                ctx.check_cfg(package = 'fftw3', atleast_version = '3.0.0',
    189                         args = '--cflags --libs', mandatory = False)
     191                        args = '--cflags --libs', mandatory =
     192                        ctx.options.enable_fftw3)
    190193            else:
    191194                ctx.check_cfg(package = 'fftw3f', atleast_version = '3.0.0',
    192                         args = '--cflags --libs', mandatory = False)
     195                        args = '--cflags --libs',
     196                        mandatory = ctx.options.enable_fftw3)
    193197        ctx.define('HAVE_FFTW3', 1)
    194198
     
    206210    if (ctx.options.enable_sndfile != False):
    207211        ctx.check_cfg(package = 'sndfile', atleast_version = '1.0.4',
    208                 args = '--cflags --libs', mandatory = False)
     212                args = '--cflags --libs',
     213                mandatory = ctx.options.enable_sndfile)
    209214
    210215    # check for libsamplerate
    211216    if (ctx.options.enable_samplerate != False):
    212217        ctx.check_cfg(package = 'samplerate', atleast_version = '0.0.15',
    213                 args = '--cflags --libs', mandatory = False)
     218                args = '--cflags --libs',
     219                mandatory = ctx.options.enable_samplerate)
    214220
    215221    # check for jack
    216222    if (ctx.options.enable_jack != False):
    217223        ctx.check_cfg(package = 'jack',
    218                 args = '--cflags --libs', mandatory = False)
     224                args = '--cflags --libs',
     225                mandatory = ctx.options.enable_jack)
    219226
    220227    # check for libav
    221228    if (ctx.options.enable_avcodec != False):
    222229        ctx.check_cfg(package = 'libavcodec', atleast_version = '54.35.0',
    223                 args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = False)
     230                args = '--cflags --libs', uselib_store = 'AVCODEC',
     231                mandatory = ctx.options.enable_avcodec)
    224232        ctx.check_cfg(package = 'libavformat', atleast_version = '52.3.0',
    225                 args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = False)
     233                args = '--cflags --libs', uselib_store = 'AVFORMAT',
     234                mandatory = ctx.options.enable_avcodec)
    226235        ctx.check_cfg(package = 'libavutil', atleast_version = '52.3.0',
    227                 args = '--cflags --libs', uselib_store = 'AVUTIL', mandatory = False)
     236                args = '--cflags --libs', uselib_store = 'AVUTIL',
     237                mandatory = ctx.options.enable_avcodec)
    228238        ctx.check_cfg(package = 'libavresample', atleast_version = '1.0.1',
    229                 args = '--cflags --libs', uselib_store = 'AVRESAMPLE', mandatory = False)
     239                args = '--cflags --libs', uselib_store = 'AVRESAMPLE',
     240                mandatory = ctx.options.enable_avcodec)
    230241        if all ( 'HAVE_' + i in ctx.env.define_key
    231242                for i in ['AVCODEC', 'AVFORMAT', 'AVUTIL', 'AVRESAMPLE'] ):
     
    323334    ctx.excl += ' **/python.old/*'
    324335    ctx.excl += ' **/python/tests/sounds'
     336    ctx.excl += ' **/**.asc'
Note: See TracChangeset for help on using the changeset viewer.