diff options
| author | Twinaphex | 2016-04-22 17:06:53 +0200 |
|---|---|---|
| committer | Twinaphex | 2016-04-22 17:06:53 +0200 |
| commit | 18ef7635b0b265350eb8304a26edeb8d4b0b2e19 (patch) | |
| tree | 93e9704ebb9395c4f6c7bab847d9df7abb005d3d /frontend/main.c | |
| parent | 4ed8f00a1221b15925117f1c7413b4640e6e7198 (diff) | |
| parent | 163249087400935f084080127990bc762e83319c (diff) | |
| download | pcsx_rearmed-18ef7635b0b265350eb8304a26edeb8d4b0b2e19.tar.gz pcsx_rearmed-18ef7635b0b265350eb8304a26edeb8d4b0b2e19.tar.bz2 pcsx_rearmed-18ef7635b0b265350eb8304a26edeb8d4b0b2e19.zip | |
Merge pull request #33 from dankcushions/master
Merging in latest upstream changes
Diffstat (limited to 'frontend/main.c')
| -rw-r--r-- | frontend/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/frontend/main.c b/frontend/main.c index 2deff70..f048584 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -26,6 +26,7 @@ #include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "../plugins/cdrcimg/cdrcimg.h" #include "../plugins/dfsound/spu_config.h" +#include "arm_features.h" #include "revision.h" #ifndef NO_FRONTEND @@ -142,7 +143,7 @@ void emu_set_default_config(void) spu_config.iVolume = 768; spu_config.iTempo = 0; spu_config.iUseThread = 1; // no effect if only 1 core is detected -#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX GPH hack */ +#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */ spu_config.iUseReverb = 0; spu_config.iUseInterpolation = 0; spu_config.iTempo = 1; @@ -771,7 +772,7 @@ int emu_save_state(int slot) return ret; ret = SaveState(fname); -#if defined(__arm__) && !defined(__ARM_ARCH_7A__) && !defined(_3DS) /* XXX GPH hack */ +#ifdef HAVE_PRE_ARMV7 /* XXX GPH hack */ sync(); #endif SysPrintf("* %s \"%s\" [%d]\n", |