mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-25 16:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) Add logging

Browse Source
This commit is contained in:
Twinaphex 2012-09-10 01:11:49 +02:00
parent 61b0811501
commit 8fcb79e86c
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/jni/Android.mk
View File

@ -9,6 +9,6 @@ LOCAL_SRC_FILES = ../../console/griffin/griffin.c ../../console/rzlib/rzlib.c
LOCAL_CFLAGS = -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_ZLIB -DINLINE=inline -DRARCH_CONSOLE -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -std=gnu99 LOCAL_CFLAGS = -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_ZLIB -DINLINE=inline -DRARCH_CONSOLE -DLSB_FIRST -D__LIBRETRO__ -DHAVE_CONFIGFILE=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -std=gnu99
LOCAL_LDLIBS := -lGLESv2 LOCAL_LDLIBS := -lGLESv2 -llog
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

16
retroarch_logger.h
View File

@ -17,12 +17,18 @@
#ifndef __RARCH_LOGGER_H #ifndef __RARCH_LOGGER_H
#define __RARCH_LOGGER_H #define __RARCH_LOGGER_H
#ifdef ANDROID
#include <android/log.h>
#endif
#if defined(RARCH_CONSOLE) && (defined(HAVE_LOGGER) || defined(HAVE_FILE_LOGGER) || defined(_XBOX1)) #if defined(RARCH_CONSOLE) && (defined(HAVE_LOGGER) || defined(HAVE_FILE_LOGGER) || defined(_XBOX1))
#include <logger_override.h> #include <logger_override.h>
#else #else
#ifndef RARCH_LOG #ifndef RARCH_LOG
#ifdef IS_SALAMANDER #if defined(ANDROID)
#define RARCH_LOG(...) __android_log_print(ANDROID_LOG_INFO,"RetroArch: ",__VA_ARGS__)
#elif defined(IS_SALAMANDER)
#define RARCH_LOG(...) do { \ #define RARCH_LOG(...) do { \
fprintf(stderr, "RetroArch Salamander: " __VA_ARGS__); \ fprintf(stderr, "RetroArch Salamander: " __VA_ARGS__); \
fflush(stderr); \ fflush(stderr); \
@ -39,7 +45,9 @@
#endif #endif
#ifndef RARCH_ERR #ifndef RARCH_ERR
#ifdef IS_SALAMANDER #if defined(ANDROID)
#define RARCH_ERR(...) __android_log_print(ANDROID_LOG_INFO, "RetroArch [ERROR] :: ",__VA_ARGS__)
#elif defined(IS_SALAMANDER)
#define RARCH_ERR(...) do { \ #define RARCH_ERR(...) do { \
fprintf(stderr, "RetroArch Salamander [ERROR] :: " __VA_ARGS__); \ fprintf(stderr, "RetroArch Salamander [ERROR] :: " __VA_ARGS__); \
fflush(stderr); \ fflush(stderr); \
@ -53,7 +61,9 @@
#endif #endif
#ifndef RARCH_WARN #ifndef RARCH_WARN
#ifdef IS_SALAMANDER #if defined(ANDROID)
#define RARCH_WARN(...) __android_log_print(ANDROID_LOG_INFO, "RetroArch [WARN] :: ",__VA_ARGS__)
#elif defined(IS_SALAMANDER)
#define RARCH_WARN(...) do { \ #define RARCH_WARN(...) do { \
fprintf(stderr, "RetroArch Salamander [WARN] :: " __VA_ARGS__); \ fprintf(stderr, "RetroArch Salamander [WARN] :: " __VA_ARGS__); \
fflush(stderr); \ fflush(stderr); \