diff --git a/otherbuilds/check.sh b/otherbuilds/check.sh index 874f6df..0a3c3e5 100755 --- a/otherbuilds/check.sh +++ b/otherbuilds/check.sh @@ -1,17 +1,47 @@ #!/bin/bash set -eu + if [ ! -d /Applications ]; then + # Assumed to be Linux + + echo " *** Building static library using Linux-specific Makefile" +# make -f otherbuilds/Makefile.linux clean make -f otherbuilds/Makefile.linux + + echo " *** Linking against static library" g++ main/main.cpp lib/librubberband.a -I. -Isrc -o test -lsndfile -lsamplerate -lpthread + + echo " *** Running build from Linux-specific Makefile" ./test -V + + echo " *** Building with single-file source" g++ main/main.cpp single/RubberBandSingle.cpp -o test_single -lsndfile + + echo " *** Running build from single-file source" ./test_single -V + + echo " *** OK" + else - make -f otherbuilds/Makefile.macos - c++ main/main.cpp lib/librubberband.a -I. -Isrc -o test -lsndfile -lsamplerate -framework Accelerate - ./test -V - c++ main/main.cpp single/RubberBandSingle.cpp -o test_single -lsndfile -framework Accelerate - ./test_single -V + + echo " *** Building static library using macOS-specific Makefile" make -f otherbuilds/Makefile.macos clean + make -f otherbuilds/Makefile.macos + + echo " *** Linking against static library" + c++ main/main.cpp lib/librubberband.a -I. -Isrc -o test -lsndfile -lsamplerate -framework Accelerate + + echo " *** Running build from macOS-specific Makefile" + ./test -V + + echo " *** Building with single-file source" +c++ main/main.cpp single/RubberBandSingle.cpp -o test_single -lsndfile -framework Accelerate + + echo " *** Running build from single-file source" + ./test_single -V + + echo " *** Building static library using iOS-specific Makefile" + make -f otherbuilds/Makefile.ios clean make -f otherbuilds/Makefile.ios + fi diff --git a/src/system/Allocators.h b/src/system/Allocators.h index 1536954..6f1df54 100644 --- a/src/system/Allocators.h +++ b/src/system/Allocators.h @@ -343,12 +343,12 @@ public: abort(); #endif } - return ::RubberBand::allocate(n); + return RubberBand::allocate(n); } void deallocate(T *const p, const size_t) const { - ::RubberBand::deallocate(p); + RubberBand::deallocate(p); } template diff --git a/src/system/sysutils.h b/src/system/sysutils.h index 86a2896..40f24cc 100644 --- a/src/system/sysutils.h +++ b/src/system/sysutils.h @@ -135,8 +135,8 @@ extern void system_memorybarrier(); #include #include -#define MLOCK(a,b) ::mlock((char *)(a),(b)) -#define MUNLOCK(a,b) (::munlock((char *)(a),(b)) ? (::perror("munlock failed"), 0) : 0) +#define MLOCK(a,b) mlock((char *)(a),(b)) +#define MUNLOCK(a,b) (munlock((char *)(a),(b)) ? (perror("munlock failed"), 0) : 0) #define MUNLOCK_SAMPLEBLOCK(a) do { if (!(a).empty()) { const float &b = *(a).begin(); MUNLOCK(&b, (a).capacity() * sizeof(float)); } } while(0); #ifdef __APPLE__