diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-11-28 20:57:23 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-11-28 20:57:23 -0300 |
| commit | 68aaa0f813bed1e33a55b05d70c560023a3d0c6a (patch) | |
| tree | 91a4400e48eb2183d4b15ea526a2f253017fb210 /drivers/opus/celt/arm/armcpu.c | |
| parent | 7aa39b7cae364347cf379bb8f216adf0a79f37c7 (diff) | |
| parent | 68c56f81f9f77f1296826be382958e2ecc38826b (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'drivers/opus/celt/arm/armcpu.c')
| -rw-r--r-- | drivers/opus/celt/arm/armcpu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/opus/celt/arm/armcpu.c b/drivers/opus/celt/arm/armcpu.c index 7f0af631b9..fb7f2421fe 100644 --- a/drivers/opus/celt/arm/armcpu.c +++ b/drivers/opus/celt/arm/armcpu.c @@ -27,16 +27,16 @@ /* Original code from libtheora modified to suit to Opus */ -#ifdef OPUS_HAVE_CONFIG_H -#include "opus_config.h" +#ifdef OPUS_ENABLED +#include "opus/opus_config.h" #endif #ifdef OPUS_HAVE_RTCD -#include "armcpu.h" -#include "cpu_support.h" -#include "os_support.h" -#include "opus_types.h" +#include "opus/celt/arm/armcpu.h" +#include "opus/celt/cpu_support.h" +#include "opus/celt/os_support.h" +#include "opus/opus_types.h" #define OPUS_CPU_ARM_V4 (1) #define OPUS_CPU_ARM_EDSP (1<<1) |