mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-03 11:32:43 +01:00
fix deb-x64 and osx-x64 builds after soundtouch update
This commit is contained in:
parent
d8f5ecf3ce
commit
1bd80d781c
8
Externals/soundtouch/STTypes.h
vendored
8
Externals/soundtouch/STTypes.h
vendored
@ -57,7 +57,7 @@ typedef unsigned long ulong;
|
|||||||
#if (defined(__GNUC__) && !defined(ANDROID))
|
#if (defined(__GNUC__) && !defined(ANDROID))
|
||||||
// In GCC, include soundtouch_config.h made by config scritps.
|
// In GCC, include soundtouch_config.h made by config scritps.
|
||||||
// Skip this in Android compilation that uses GCC but without configure scripts.
|
// Skip this in Android compilation that uses GCC but without configure scripts.
|
||||||
#include "soundtouch_config.h"
|
//#include "soundtouch_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef _WINDEF_
|
#ifndef _WINDEF_
|
||||||
@ -75,8 +75,8 @@ namespace soundtouch
|
|||||||
{
|
{
|
||||||
/// Activate these undef's to overrule the possible sampletype
|
/// Activate these undef's to overrule the possible sampletype
|
||||||
/// setting inherited from some other header file:
|
/// setting inherited from some other header file:
|
||||||
//#undef SOUNDTOUCH_INTEGER_SAMPLES
|
#undef SOUNDTOUCH_INTEGER_SAMPLES
|
||||||
//#undef SOUNDTOUCH_FLOAT_SAMPLES
|
#undef SOUNDTOUCH_FLOAT_SAMPLES
|
||||||
|
|
||||||
/// If following flag is defined, always uses multichannel processing
|
/// If following flag is defined, always uses multichannel processing
|
||||||
/// routines also for mono and stero sound. This is for routine testing
|
/// 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 switch to disable throwing std exceptions:
|
||||||
// #define ST_NO_EXCEPTION_HANDLING 1
|
#define ST_NO_EXCEPTION_HANDLING 1
|
||||||
#ifdef ST_NO_EXCEPTION_HANDLING
|
#ifdef ST_NO_EXCEPTION_HANDLING
|
||||||
// Exceptions disabled. Throw asserts instead if enabled.
|
// Exceptions disabled. Throw asserts instead if enabled.
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user