From b4490ae4966d847b0907484a193476b141ce7c89 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 4 Mar 2013 14:21:37 +0100 Subject: [PATCH] (Android) Don't define HAVE_ASYNC_POLL for now --- android/native/jni/Android.mk | 2 +- frontend/frontend_android.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk index a5d2de13f4..1039768f1c 100644 --- a/android/native/jni/Android.mk +++ b/android/native/jni/Android.mk @@ -51,7 +51,7 @@ ifeq ($(PERF_TEST), 1) LOCAL_CFLAGS += -DPERF_TEST endif -LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_ASYNC_POLL -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DWANT_MINIZ -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 -I../../../deps/miniz +LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DWANT_MINIZ -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 -I../../../deps/miniz LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 $(LOGGER_LDLIBS) -ldl diff --git a/frontend/frontend_android.c b/frontend/frontend_android.c index 24476b9ddf..1747a0dc16 100644 --- a/frontend/frontend_android.c +++ b/frontend/frontend_android.c @@ -219,9 +219,7 @@ static void *android_app_entry(void *data) // Main loop do { -#ifdef HAVE_ASYNC_POLL input_async_poll_func(); -#endif } while (rarch_main_iterate()); RARCH_LOG("RetroArch stopped.\n");