david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OS/X build fixes

Browse Source
This commit is contained in:
Chris Cannam
2012-09-09 18:11:04 +01:00
parent 898a41de9a
commit 16a68c617d
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.osx
View File

@@ -1,10 +1,10 @@
CXX := g++ CXX := g++
CC := gcc CC := gcc
ARCHFLAGS := -arch i386 -arch x86_64 ARCHFLAGS :=
OPTFLAGS := -DNDEBUG -ffast-math -mfpmath=sse -msse -msse2 -O3 -ftree-vectorize OPTFLAGS := -DNDEBUG -ffast-math -mfpmath=sse -msse -msse2 -O3 -ftree-vectorize
CXXFLAGS := $(ARCHFLAGS) $(OPTFLAGS) -I/usr/local/include -DUSE_PTHREADS -DHAVE_VDSP -DUSE_SPEEX -DNO_THREAD_CHECKS -DNO_TIMING -Irubberband -I. -Isrc CXXFLAGS := $(ARCHFLAGS) $(OPTFLAGS) -I/usr/local/include -DUSE_PTHREADS -DMALLOC_IS_ALIGNED -DHAVE_VDSP -DUSE_SPEEX -DNO_THREAD_CHECKS -DNO_TIMING -Irubberband -I. -Isrc
LIBRARY_LIBS := -framework Accelerate LIBRARY_LIBS := -framework Accelerate

2
src/system/Allocators.h
View File

@@ -77,7 +77,9 @@ T *allocate(size_t count)
#ifdef __MSVC__ #ifdef __MSVC__
ptr = _aligned_malloc(count * sizeof(T), alignment); ptr = _aligned_malloc(count * sizeof(T), alignment);
#else /* !__MSVC__ */ #else /* !__MSVC__ */
#ifndef MALLOC_IS_ALIGNED
#warning "No aligned malloc available or defined" #warning "No aligned malloc available or defined"
#endif
// Note that malloc always aligns to 16 byte boundaries on OS/X // Note that malloc always aligns to 16 byte boundaries on OS/X
ptr = malloc(count * sizeof(T)); ptr = malloc(count * sizeof(T));
#endif /* !__MSVC__ */ #endif /* !__MSVC__ */

2
src/system/VectorOps.h
View File

@@ -674,7 +674,7 @@ inline void v_abs(float *const R__ dst,
const int count) const int count)
{ {
float tmp[count]; float tmp[count];
vvfabf(tmp, dst, &count); vvfabsf(tmp, dst, &count);
v_copy(dst, tmp, count); v_copy(dst, tmp, count);
} }
#endif #endif