diff --git a/src/platform.h b/src/platform.h index 12144453..02b8f52f 100644 --- a/src/platform.h +++ b/src/platform.h @@ -3,22 +3,17 @@ #pragma once #ifdef __ANDROID__ - -#include - -void lovrLog(const char * restrict format, ...); -void lovrLogv(const char * restrict format, va_list ap); -void lovrWarn(const char * restrict format, ...); -void lovrWarnv(const char * restrict format, va_list ap); - +#include +#define lovrLog(...) __android_log_print(ANDROID_LOG_DEBUG, "LOVR", __VA_ARGS__) +#define lovrLogv(...) __android_log_vprint(ANDROID_LOG_DEBUG, "LOVR", __VA_ARGS__) +#define lovrWarn(...) __android_log_print(ANDROID_LOG_WARN, "LOVR", __VA_ARGS__) +#define lovrWarnv(...) __android_log_vprint(ANDROID_LOG_WARN, "LOVR", __VA_ARGS__) #else - #include #define lovrLog(...) printf(__VA_ARGS__) #define lovrLogv(...) vprintf(__VA_ARGS__) #define lovrWarn(...) fprintf(stderr, __VA_ARGS__) #define lovrWarnv(...) vfprintf(stderr, __VA_ARGS__) - #endif void lovrSleep(double seconds); diff --git a/src/platform/android.c b/src/platform/android.c index 642cc62f..948df4b7 100644 --- a/src/platform/android.c +++ b/src/platform/android.c @@ -1,30 +1 @@ #include "platform.h" -#include -#include -#include - -// Currently Android targets also include the linux.c platform. -// These additional functions are here because stdout/stderr aren't wired up on Android: - - -void lovrLogv(const char * restrict format, va_list ap) { - __android_log_vprint(ANDROID_LOG_DEBUG, "LOVR", format, ap); -} - -void lovrLog(const char * restrict format, ...) { - va_list args; - va_start(args, format); - lovrLogv(format, args); - va_end(args); -} - -void lovrWarnv(const char * restrict format, va_list ap) { - __android_log_vprint(ANDROID_LOG_WARN, "LOVR", format, ap); -} - -void lovrWarn(const char * restrict format, ...) { - va_list args; - va_start(args, format); - lovrWarnv(format, args); - va_end(args); -}