Changes in / [0e6ad10:09b4be9]


Ignore:
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • .circleci/config.yml

    r0e6ad10 r09b4be9  
    33  command: |
    44    sudo apt-get update
    5     sudo apt-get -y install make sox pkg-config libavcodec-dev libavformat-dev libavresample-dev libavutil-dev libsndfile1-dev libsamplerate-dev libvorbis-dev
     5    sudo apt-get -y install make sox pkg-config libavcodec-dev libavformat-dev libavresample-dev libavutil-dev libsndfile1-dev libsamplerate-dev libvorbis-dev libflac-dev
    66
    77pip-install: &pip-install
  • .travis.yml

    r0e6ad10 r09b4be9  
    5959    - libsamplerate-dev
    6060    - libvorbis-dev
     61    - libflac-dec
    6162    - libjack-dev
    6263    - libasound2-dev
     
    7071    - libsndfile
    7172    - libvorbis
     73    - flac
    7274    - lcov
    7375    #update: true
  • azure-pipelines.yml

    r0e6ad10 r09b4be9  
    3030      brew update
    3131      brew install pkg-config gnupg
    32       brew install sox ffmpeg libsndfile libvorbis lcov
     32      brew install sox ffmpeg libsndfile libvorbis flac lcov
    3333    displayName: 'brew install'
    3434  - script: |
  • src/wscript_build

    r0e6ad10 r09b4be9  
    1313uselib += ['AVUTIL']
    1414uselib += ['VORBISENC']
     15uselib += ['FLAC']
    1516uselib += ['BLAS']
    1617
  • wscript

    r0e6ad10 r09b4be9  
    7070            help_str = 'compile with libvorbis (auto)',
    7171            help_disable_str = 'disable libvorbis')
     72    add_option_enable_disable(ctx, 'flac', default = None,
     73            help_str = 'compile with libFLAC (auto)',
     74            help_disable_str = 'disable libflac')
    7275    add_option_enable_disable(ctx, 'samplerate', default = None,
    7376            help_str = 'compile with samplerate (auto)',
     
    439442                uselib_store = 'VORBISENC',
    440443                mandatory = ctx.options.enable_vorbis)
     444
     445    # check for flac
     446    if (ctx.options.enable_flac != False):
     447        ctx.check_cfg(package = 'flac',
     448                args = '--cflags --libs',
     449                uselib_store = 'FLAC',
     450                mandatory = ctx.options.enable_flac)
    441451
    442452    if (ctx.options.enable_wavread != False):
Note: See TracChangeset for help on using the changeset viewer.