ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Android) Performance changes - build fix

This commit is contained in:
twinaphex 2012-11-02 04:13:35 +01:00
parent 36f32696b2
commit 7ac8d02a05
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/native/jni/Android.mk
View File

@ -55,11 +55,10 @@ LOCAL_SRC_FILES = $(RARCH_PATH)/retroarch.c \
$(RARCH_PATH)/conf/config_file.c \ $(RARCH_PATH)/conf/config_file.c \
$(RARCH_PATH)/autosave.c \ $(RARCH_PATH)/autosave.c \
$(RARCH_PATH)/thread.c \ $(RARCH_PATH)/thread.c \
$(RARCH_PATH)/performance/performance_linux.c \ $(RARCH_PATH)/performance.c \
main.c main.c
ifeq ($(PERF_TEST), 1) ifeq ($(PERF_TEST), 1)
LOCAL_SRC_FILES += $(RARCH_PATH)/performance.c
LOCAL_CFLAGS += -DPERF_TEST LOCAL_CFLAGS += -DPERF_TEST
endif endif

2
android/native/jni/main.c
View File

@ -261,8 +261,6 @@ void android_main(struct android_app* state)
} }
} }
rarch_perf_get_cpu_features();
RARCH_LOG("Starting RetroArch...\n"); RARCH_LOG("Starting RetroArch...\n");
rarch_main(argc, argv); rarch_main(argc, argv);

6
performance.c
View File

@ -88,8 +88,10 @@ rarch_perf_tick_t rarch_get_perf_counter(void)
#endif #endif
#if defined(__x86_64__) || defined(__i386__) || defined(__i486__) || defined(__i686__) #if defined(__x86_64__) || defined(__i386__) || defined(__i486__) || defined(__i686__)
#if !defined(ANDROID_ARM) || !defined(ANDROID_MIPS)
#define CPU_X86 #define CPU_X86
#endif #endif
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
#include <intrin.h> #include <intrin.h>
@ -98,7 +100,9 @@ rarch_perf_tick_t rarch_get_perf_counter(void)
#ifdef CPU_X86 #ifdef CPU_X86
static void x86_cpuid(int func, int flags[4]) static void x86_cpuid(int func, int flags[4])
{ {
#ifdef __GNUC__ #if defined(__GNUC__) && !defined(ANDROID)
/* doesn't compile on x86 Android -
* error - inconsistent operand constraints in an 'asm' */
asm volatile("cpuid\n" : asm volatile("cpuid\n" :
"=a"(flags[0]), "=a"(flags[0]),
"=b"(flags[1]), "=b"(flags[1]),