fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix compilation with mips16 

Some users wrongly pass both -mips16 and -mdsp when compiling on MIPS
platforms. Handle such a case.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-12-23 01:06:02 -08:00 committed by Martin Storsjo
parent f490b51ab7
commit ade2484bc8
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libFDK/include/mips/abs_mips.h
View File

@ -107,7 +107,7 @@ amm-info@iis.fraunhofer.de
#if defined(__GNUC__) && defined(__mips__) #if defined(__GNUC__) && defined(__mips__)
#if defined(__mips_dsp) #if defined(__mips_dsp) && !defined(__mips16)
#define FUNCTION_fixabs_D #define FUNCTION_fixabs_D
#define FUNCTION_fixabs_I #define FUNCTION_fixabs_I
#define FUNCTION_fixabs_S #define FUNCTION_fixabs_S

2
libFDK/include/mips/scale_mips.h
View File

@ -103,7 +103,7 @@ amm-info@iis.fraunhofer.de
#ifndef SCALE_MIPS_H #ifndef SCALE_MIPS_H
#define SCALE_MIPS_H #define SCALE_MIPS_H
#if defined(__mips_dsp) #if defined(__mips_dsp) && !defined(__mips16)
/*! /*!
* *

2
libFDK/include/scramble.h
View File

@ -108,7 +108,7 @@ amm-info@iis.fraunhofer.de
#if defined(__arm__) #if defined(__arm__)
#include "arm/scramble_arm.h" #include "arm/scramble_arm.h"
#elif defined(__mips__) && defined(__mips_dsp) #elif defined(__mips__) && defined(__mips_dsp) && !defined(__mips16)
#include "mips/scramble_mips.h" #include "mips/scramble_mips.h"
#endif #endif

2
libFDK/src/fft_rad2.cpp
View File

@ -109,7 +109,7 @@ amm-info@iis.fraunhofer.de
#if defined(__arm__) #if defined(__arm__)
#include "arm/fft_rad2_arm.cpp" #include "arm/fft_rad2_arm.cpp"
#elif defined(__GNUC__) && defined(__mips__) && defined(__mips_dsp) #elif defined(__GNUC__) && defined(__mips__) && defined(__mips_dsp) && !defined(__mips16)
#include "mips/fft_rad2_mips.cpp" #include "mips/fft_rad2_mips.cpp"
#endif #endif

2
libFDK/src/mips/scale_mips.cpp
View File

@ -100,7 +100,7 @@ amm-info@iis.fraunhofer.de
*******************************************************************************/ *******************************************************************************/
#if defined(__mips_dsp) #if defined(__mips_dsp) && !defined(__mips16)
#ifndef FUNCTION_getScalefactor_DBL #ifndef FUNCTION_getScalefactor_DBL
#define FUNCTION_getScalefactor_DBL #define FUNCTION_getScalefactor_DBL