From 1bd80d781ce6053cde4fe2bdbbed5474e660b4be Mon Sep 17 00:00:00 2001 From: Tetsuo55 Date: Sat, 22 Jun 2013 21:51:11 +0200 Subject: [PATCH] fix deb-x64 and osx-x64 builds after soundtouch update --- Externals/soundtouch/STTypes.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Externals/soundtouch/STTypes.h b/Externals/soundtouch/STTypes.h index 4405aa0c9f..efe34fdfa4 100644 --- a/Externals/soundtouch/STTypes.h +++ b/Externals/soundtouch/STTypes.h @@ -57,7 +57,7 @@ typedef unsigned long ulong; #if (defined(__GNUC__) && !defined(ANDROID)) // In GCC, include soundtouch_config.h made by config scritps. // Skip this in Android compilation that uses GCC but without configure scripts. - #include "soundtouch_config.h" + //#include "soundtouch_config.h" #endif #ifndef _WINDEF_ @@ -75,8 +75,8 @@ namespace soundtouch { /// Activate these undef's to overrule the possible sampletype /// setting inherited from some other header file: - //#undef SOUNDTOUCH_INTEGER_SAMPLES - //#undef SOUNDTOUCH_FLOAT_SAMPLES + #undef SOUNDTOUCH_INTEGER_SAMPLES + #undef SOUNDTOUCH_FLOAT_SAMPLES /// If following flag is defined, always uses multichannel processing /// routines also for mono and stero sound. This is for routine testing @@ -174,7 +174,7 @@ namespace soundtouch }; // define ST_NO_EXCEPTION_HANDLING switch to disable throwing std exceptions: -// #define ST_NO_EXCEPTION_HANDLING 1 + #define ST_NO_EXCEPTION_HANDLING 1 #ifdef ST_NO_EXCEPTION_HANDLING // Exceptions disabled. Throw asserts instead if enabled. #include