mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) Make logging optional

Browse Source
This commit is contained in:
twinaphex 2012-12-16 04:13:31 +01:00
parent c54d4a6955
commit ae089a7b58
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
RARCH_VERSION = "0.9.8-beta3" RARCH_VERSION = "0.9.8-beta3"
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
PERF_TEST := 0 PERF_TEST := 0
HAVE_OPENSL := 1
HAVE_NEON := 1 HAVE_NEON := 1
HAVE_SINC := 1 HAVE_SINC := 1
HAVE_LOGGER := 1
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -44,6 +44,10 @@ RARCH_PATH := ../../..
LIBXML_PATH := ../../../deps/libxml2 LIBXML_PATH := ../../../deps/libxml2
LOCAL_SRC_FILES += $(RARCH_PATH)/console/griffin/griffin.c 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) ifeq ($(PERF_TEST), 1)
LOCAL_CFLAGS += -DPERF_TEST LOCAL_CFLAGS += -DPERF_TEST
@ -51,12 +55,10 @@ 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__ -DHAVE_CONFIGFILE=1 -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__ -DHAVE_CONFIGFILE=1 -DRARCH_PERFORMANCE_MODE -DRARCH_GPU_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99
LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 -llog -ldl LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 $(LOGGER_LDLIBS) -ldl
LOCAL_C_INCLUDES += $(LIBXML_PATH) LOCAL_C_INCLUDES += $(LIBXML_PATH)
ifeq ($(HAVE_OPENSL), 1)
LOCAL_CFLAGS += -DHAVE_SL LOCAL_CFLAGS += -DHAVE_SL
LOCAL_LDLIBS += -lOpenSLES LOCAL_LDLIBS += -lOpenSLES
endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

2
console/griffin/griffin.c
View File

@ -24,7 +24,7 @@ LOGGERS
#if defined(HAVE_LOGGER) && defined(__PSL1GHT__) #if defined(HAVE_LOGGER) && defined(__PSL1GHT__)
#include "../logger/psl1ght_logger.c" #include "../logger/psl1ght_logger.c"
#elif defined(HAVE_LOGGER) #elif defined(HAVE_LOGGER) && !defined(ANDROID)
#include "../logger/logger.c" #include "../logger/logger.c"
#endif #endif

14
retroarch_logger.h
View File

@ -17,7 +17,7 @@
#ifndef __RARCH_LOGGER_H #ifndef __RARCH_LOGGER_H
#define __RARCH_LOGGER_H #define __RARCH_LOGGER_H
#ifdef ANDROID #if defined(ANDROID) && defined(HAVE_LOGGER)
#include <android/log.h> #include <android/log.h>
#endif #endif
@ -32,7 +32,7 @@
#else #else
#ifndef RARCH_LOG #ifndef RARCH_LOG
#if defined(ANDROID) #if defined(ANDROID) && defined(HAVE_LOGGER)
#define RARCH_LOG(...) __android_log_print(ANDROID_LOG_INFO, "RetroArch: ", __VA_ARGS__) #define RARCH_LOG(...) __android_log_print(ANDROID_LOG_INFO, "RetroArch: ", __VA_ARGS__)
#elif defined(IS_SALAMANDER) #elif defined(IS_SALAMANDER)
#define RARCH_LOG(...) do { \ #define RARCH_LOG(...) do { \
@ -51,7 +51,7 @@
#endif #endif
#ifndef RARCH_LOG_OUTPUT #ifndef RARCH_LOG_OUTPUT
#if defined(ANDROID) #if defined(ANDROID) && defined(HAVE_LOGGER)
#define RARCH_LOG_OUTPUT(...) __android_log_print(ANDROID_LOG_INFO,"stderr: ",__VA_ARGS__) #define RARCH_LOG_OUTPUT(...) __android_log_print(ANDROID_LOG_INFO,"stderr: ",__VA_ARGS__)
#elif defined(IS_SALAMANDER) #elif defined(IS_SALAMANDER)
#define RARCH_LOG_OUTPUT(...) do { \ #define RARCH_LOG_OUTPUT(...) do { \
@ -70,7 +70,7 @@
#endif #endif
#ifndef RARCH_ERR #ifndef RARCH_ERR
#if defined(ANDROID) #if defined(ANDROID) && defined(HAVE_LOGGER)
#define RARCH_ERR(...) __android_log_print(ANDROID_LOG_INFO, "RetroArch [ERROR] :: ", __VA_ARGS__) #define RARCH_ERR(...) __android_log_print(ANDROID_LOG_INFO, "RetroArch [ERROR] :: ", __VA_ARGS__)
#elif defined(IS_SALAMANDER) #elif defined(IS_SALAMANDER)
#define RARCH_ERR(...) do { \ #define RARCH_ERR(...) do { \
@ -86,7 +86,7 @@
#endif #endif
#ifndef RARCH_ERR_OUTPUT #ifndef RARCH_ERR_OUTPUT
#if defined(ANDROID) #if defined(ANDROID) && defined(HAVE_LOGGER)
#define RARCH_ERR_OUTPUT(...) __android_log_print(ANDROID_LOG_INFO, "stderr [ERROR] :: ", __VA_ARGS__) #define RARCH_ERR_OUTPUT(...) __android_log_print(ANDROID_LOG_INFO, "stderr [ERROR] :: ", __VA_ARGS__)
#elif defined(IS_SALAMANDER) #elif defined(IS_SALAMANDER)
#define RARCH_ERR_OUTPUT(...) do { \ #define RARCH_ERR_OUTPUT(...) do { \
@ -102,7 +102,7 @@
#endif #endif
#ifndef RARCH_WARN #ifndef RARCH_WARN
#if defined(ANDROID) #if defined(ANDROID) && defined(HAVE_LOGGER)
#define RARCH_WARN(...) __android_log_print(ANDROID_LOG_INFO, "RetroArch [WARN] :: ", __VA_ARGS__) #define RARCH_WARN(...) __android_log_print(ANDROID_LOG_INFO, "RetroArch [WARN] :: ", __VA_ARGS__)
#elif defined(IS_SALAMANDER) #elif defined(IS_SALAMANDER)
#define RARCH_WARN(...) do { \ #define RARCH_WARN(...) do { \
@ -118,7 +118,7 @@
#endif #endif
#ifndef RARCH_WARN #ifndef RARCH_WARN
#if defined(ANDROID) #if defined(ANDROID) && defined(HAVE_LOGGER)
#define RARCH_WARN_OUTPUT(...) __android_log_print(ANDROID_LOG_INFO, "stderr [WARN] :: ", __VA_ARGS__) #define RARCH_WARN_OUTPUT(...) __android_log_print(ANDROID_LOG_INFO, "stderr [WARN] :: ", __VA_ARGS__)
#elif defined(IS_SALAMANDER) #elif defined(IS_SALAMANDER)
#define RARCH_WARN_OUTPUT(...) do { \ #define RARCH_WARN_OUTPUT(...) do { \