Changeset 057ecee for src/aubio_priv.h
- Timestamp:
- Jan 8, 2019, 7:21:22 PM (6 years ago)
- Branches:
- feature/crepe_org
- Children:
- 977a5c3
- Parents:
- ba740ea (diff), 65a4fb4 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/aubio_priv.h
rba740ea r057ecee 75 75 #endif 76 76 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 83 79 #if defined(HAVE_ATLAS_CBLAS_H) 84 80 #define HAVE_ATLAS 1 … … 88 84 #elif defined(HAVE_CBLAS_H) 89 85 #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 94 95 #include <Accelerate/Accelerate.h> 96 95 97 #ifndef HAVE_AUBIO_DOUBLE 96 98 #define aubio_vDSP_mmov vDSP_mmov
Note: See TracChangeset
for help on using the changeset viewer.