Changeset d4791e5 for wscript


Ignore:
Timestamp:
Jan 3, 2014, 12:47:22 AM (10 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:
2e01060
Parents:
89e9e71 (diff), 4fe62ba (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' of aubio.org:/git/aubio/aubio into develop

File:
1 edited

Legend:

Unmodified
Added
Removed
  • wscript

    r89e9e71 rd4791e5  
    8686    ctx.load('gnu_dirs')
    8787
    88     ctx.env.CFLAGS += ['-g', '-Wall', '-Wextra']
    89 
    9088    target_platform = Options.platform
    9189    if ctx.options.target_platform:
    9290        target_platform = ctx.options.target_platform
    9391    ctx.env['DEST_OS'] = target_platform
     92
     93    if 'CL.exe' not in ctx.env.CC[0]:
     94        ctx.env.CFLAGS += ['-g', '-Wall', '-Wextra']
     95    else:
     96        ctx.env.CFLAGS += ['-Wall']
    9497
    9598    if target_platform not in ['win32', 'win64']:
     
    152155    if ctx.check_cc(fragment = check_c99_varargs,
    153156            type='cstlib',
    154             msg = 'Checking for C99 __VA_ARGS__ macro'):
     157            msg = 'Checking for C99 __VA_ARGS__ macro',
     158            mandatory = False):
    155159        ctx.define('HAVE_C99_VARARGS_MACROS', 1)
    156160
Note: See TracChangeset for help on using the changeset viewer.