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

(Android) Compile with DPERF_TEST enabled - replace CLOCK_MONOTONIC_RAW 

with CLOCK_MONOTONIC
This commit is contained in:
twinaphex 2012-10-16 23:29:03 +02:00
parent 4212458625
commit bed99bb0da
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,12 +3,11 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
APP_OPTIM := debug
LOCAL_MODULE := retroarch-activity LOCAL_MODULE := retroarch-activity
RARCH_PATH := ../../.. RARCH_PATH := ../../..
LOCAL_SRC_FILES = $(RARCH_PATH)/retroarch.c \ LOCAL_SRC_FILES = $(RARCH_PATH)/retroarch.c \
$(RARCH_PATH)/benchmark.c \
$(RARCH_PATH)/file.c \ $(RARCH_PATH)/file.c \
$(RARCH_PATH)/file_path.c \ $(RARCH_PATH)/file_path.c \
$(RARCH_PATH)/hash.c \ $(RARCH_PATH)/hash.c \
@ -45,7 +44,7 @@ LOCAL_SRC_FILES = $(RARCH_PATH)/retroarch.c \
$(RARCH_PATH)/thread.c \ $(RARCH_PATH)/thread.c \
main.c main.c
LOCAL_CFLAGS = -marm -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 LOCAL_CFLAGS = -marm -DPERF_TEST -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99
LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl -lz LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl -lz
LOCAL_STATIC_LIBRARIES := android_native_app_glue LOCAL_STATIC_LIBRARIES := android_native_app_glue

2
benchmark.c
View File

@ -40,7 +40,7 @@ rarch_perf_tick_t rarch_get_perf_counter(void)
#elif defined(__linux__) #elif defined(__linux__)
struct timespec tv; struct timespec tv;
if (clock_gettime(CLOCK_MONOTONIC_RAW, &tv) == 0) if (clock_gettime(CLOCK_MONOTONIC, &tv) == 0)
time = (rarch_perf_tick_t)tv.tv_sec * 1000000000 + (rarch_perf_tick_t)tv.tv_nsec; time = (rarch_perf_tick_t)tv.tv_sec * 1000000000 + (rarch_perf_tick_t)tv.tv_nsec;
else else
time = 0; time = 0;