Changeset 63fc1df


Ignore:
Timestamp:
Jun 29, 2019, 4:57:24 PM (5 months ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
master
Parents:
b1ed6ce (diff), cf31ff1 (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 'feature/debugmode'

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/aubio_priv.h

    rb1ed6ce r63fc1df  
    237237#define AUBIO_INF(...)               aubio_log(AUBIO_LOG_INF, "AUBIO INFO: " __VA_ARGS__)
    238238#define AUBIO_MSG(...)               aubio_log(AUBIO_LOG_MSG, __VA_ARGS__)
    239 #define AUBIO_DBG(...)               aubio_log(AUBIO_LOG_DBG, __VA_ARGS__)
     239#define _AUBIO_DBG(...)              aubio_log(AUBIO_LOG_DBG, __VA_ARGS__)
    240240#define AUBIO_WRN(...)               aubio_log(AUBIO_LOG_WRN, "AUBIO WARNING: " __VA_ARGS__)
    241241#else
     
    243243#define AUBIO_INF(format, args...)   aubio_log(AUBIO_LOG_INF, "AUBIO INFO: " format , ##args)
    244244#define AUBIO_MSG(format, args...)   aubio_log(AUBIO_LOG_MSG, format , ##args)
    245 #define AUBIO_DBG(format, args...)   aubio_log(AUBIO_LOG_DBG, format , ##args)
     245#define _AUBIO_DBG(format, args...)  aubio_log(AUBIO_LOG_DBG, format , ##args)
    246246#define AUBIO_WRN(format, args...)   aubio_log(AUBIO_LOG_WRN, "AUBIO WARNING: " format, ##args)
     247#endif
     248
     249#ifdef DEBUG
     250#define AUBIO_DBG _AUBIO_DBG
     251#else
     252// disable debug output
     253#ifdef HAVE_C99_VARARGS_MACROS
     254#define AUBIO_DBG(...)               {}
     255#else
     256#define AUBIO_DBG(format, args...)   {}
     257#endif
    247258#endif
    248259
  • wscript

    rb1ed6ce r63fc1df  
    4646                    ' or without (--build-type=debug)' \
    4747                    ' compiler opimizations [default: release]')
     48    ctx.add_option('--debug', action = 'store_const',
     49            dest = 'build_type', const = 'debug',
     50            help = 'build in debug mode (see --build-type)')
    4851    add_option_enable_disable(ctx, 'fftw3f', default = False,
    4952            help_str = 'compile with fftw3f instead of ooura (recommended)',
Note: See TracChangeset for help on using the changeset viewer.