From 729bf464c538c1ae7413e922c759c41a5271f9a9 Mon Sep 17 00:00:00 2001 From: notaz Date: Wed, 26 Dec 2012 01:40:09 +0200 Subject: [PATCH] (Android) Enable logger and overlay for phoenix. Doesn't build otherwise for me. --- android/phoenix/jni/Android.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/android/phoenix/jni/Android.mk b/android/phoenix/jni/Android.mk index d09d7dadca..3eabbc2505 100644 --- a/android/phoenix/jni/Android.mk +++ b/android/phoenix/jni/Android.mk @@ -4,6 +4,7 @@ PERF_TEST := 1 HAVE_OPENSL := 1 HAVE_NEON := 1 HAVE_SINC := 1 +HAVE_LOGGER := 1 include $(CLEAR_VARS) @@ -44,12 +45,16 @@ RARCH_PATH := ../../.. LIBXML_PATH := ../../../deps/libxml2 LOCAL_SRC_FILES += $(RARCH_PATH)/console/griffin/griffin.c +ifeq ($(HAVE_LOGGER), 1) +LOCAL_CFLAGS += -DHAVE_LOGGER +LOGGER_LDLIBS := -llog +endif ifeq ($(PERF_TEST), 1) LOCAL_CFLAGS += -DPERF_TEST endif -LOCAL_CFLAGS += -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DWANT_RZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DRARCH_GPU_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 +LOCAL_CFLAGS += -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DWANT_RZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DRARCH_GPU_PERFORMANCE_MODE -DHAVE_OVERLAY -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl LOCAL_C_INCLUDES += $(LIBXML_PATH)