diff --git a/Frameworks/Dumb/Dumb.xcodeproj/project.pbxproj b/Frameworks/Dumb/Dumb.xcodeproj/project.pbxproj index b3ea835a0..61a3dbc7b 100644 --- a/Frameworks/Dumb/Dumb.xcodeproj/project.pbxproj +++ b/Frameworks/Dumb/Dumb.xcodeproj/project.pbxproj @@ -643,6 +643,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = _USE_SSE; HEADER_SEARCH_PATHS = dumb/include; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@loader_path/../Frameworks"; @@ -667,6 +668,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = _USE_SSE; HEADER_SEARCH_PATHS = dumb/include; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@loader_path/../Frameworks"; diff --git a/Frameworks/Dumb/dumb/include/internal/it.h b/Frameworks/Dumb/dumb/include/internal/it.h index f30cfcd2b..a0501684c 100644 --- a/Frameworks/Dumb/dumb/include/internal/it.h +++ b/Frameworks/Dumb/dumb/include/internal/it.h @@ -32,13 +32,8 @@ #include -#ifdef __FRAMEWORK__ -#include -#include -#else #include "barray.h" #include "tarray.h" -#endif /** TO DO: THINK ABOUT THE FOLLOWING: diff --git a/Frameworks/Dumb/dumb/include/internal/tarray.h b/Frameworks/Dumb/dumb/include/internal/tarray.h index 4cb4771a9..7eb3af7c6 100644 --- a/Frameworks/Dumb/dumb/include/internal/tarray.h +++ b/Frameworks/Dumb/dumb/include/internal/tarray.h @@ -3,10 +3,16 @@ #include -#ifdef __FRAMEWORK__ -#include +#ifndef LONG_LONG +#if defined __GNUC__ || defined __INTEL_COMPILER || defined __MWERKS__ +#define LONG_LONG long long +#elif defined _MSC_VER || defined __WATCOMC__ +#define LONG_LONG __int64 +#elif defined __sgi +#define LONG_LONG long long #else -#include "../dumb.h" +#error 64-bit integer type unknown +#endif #endif void * timekeeping_array_create(size_t size); diff --git a/Frameworks/Dumb/dumb/src/it/itrender.c b/Frameworks/Dumb/dumb/src/it/itrender.c index bc898ef51..d0e4e805d 100644 --- a/Frameworks/Dumb/dumb/src/it/itrender.c +++ b/Frameworks/Dumb/dumb/src/it/itrender.c @@ -787,6 +787,7 @@ static void it_filter_sse(DUMB_CLICK_REMOVER *cr, IT_FILTER_STATE *state, sample #undef LOG10 +#ifdef _USE_SSE #if defined(_M_IX86) || defined(__i386__) #ifdef _MSC_VER @@ -827,10 +828,15 @@ void _dumb_init_sse() static const int _dumb_it_use_sse = 1; +void _dumb_init_sse() { } + #else static const int _dumb_it_use_sse = 0; +void _dumb_init_sse() { } + +#endif #endif static void it_filter(DUMB_CLICK_REMOVER *cr, IT_FILTER_STATE *state, sample_t *dst, long pos, sample_t *src, long size, int step, int sampfreq, int cutoff, int resonance)