Changeset 2ca09bf for src/aubio_priv.h


Ignore:
Timestamp:
Jan 8, 2019, 6:17:11 PM (10 months ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/timestretch, master
Children:
bec1396
Parents:
dc7362fd
Message:

[aubio_priv.h] include blas first (see gh-225)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/aubio_priv.h

    rdc7362fd r2ca09bf  
    7575#endif
    7676
    77 #if defined(HAVE_ACCELERATE)
    78 #define HAVE_ATLAS 1
    79 #define HAVE_BLAS 1
    80 #include <Accelerate/Accelerate.h>
    81 #elif defined(HAVE_ATLAS_CBLAS_H)
    82 #elif defined(HAVE_BLAS)
     77#if defined(HAVE_BLAS) // --enable-blas=true
     78// check which cblas header we found
    8379#if defined(HAVE_ATLAS_CBLAS_H)
    8480#define HAVE_ATLAS 1
     
    8884#elif defined(HAVE_CBLAS_H)
    8985#include <cblas.h>
    90 #endif
    91 #endif
    92 
    93 #ifdef HAVE_ACCELERATE
     86#elif !defined(HAVE_ACCELERATE)
     87#error "HAVE_BLAS was defined, but no blas header was found"
     88#endif /* end of cblas includes */
     89#endif
     90
     91#if defined(HAVE_ACCELERATE)
     92// include accelerate framework after blas
     93#define HAVE_ATLAS 1
     94#define HAVE_BLAS 1
    9495#include <Accelerate/Accelerate.h>
     96
    9597#ifndef HAVE_AUBIO_DOUBLE
    9698#define aubio_vDSP_mmov       vDSP_mmov
Note: See TracChangeset for help on using the changeset viewer.