From 1b681e85a8a0345d0ce848a7584a7654ad629f07 Mon Sep 17 00:00:00 2001 From: Ori Avtalion Date: Thu, 28 Apr 2011 20:05:01 +0300 Subject: ANDROID: Fix compilation --- backends/platform/android/jni.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'backends/platform/android/jni.cpp') diff --git a/backends/platform/android/jni.cpp b/backends/platform/android/jni.cpp index 08a1491998..7962fa7b4b 100644 --- a/backends/platform/android/jni.cpp +++ b/backends/platform/android/jni.cpp @@ -28,6 +28,7 @@ #include "base/main.h" #include "base/version.h" #include "common/config-manager.h" +#include "common/textconsole.h" #include "engines/engine.h" #include "backends/platform/android/android.h" -- cgit v1.2.3 From 52c0b2e28c85658d0ae2d2522e6e2d02c4db8796 Mon Sep 17 00:00:00 2001 From: Ori Avtalion Date: Thu, 28 Apr 2011 20:53:01 +0300 Subject: ANDROID: Another attempt at compilation fix --- backends/platform/android/jni.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'backends/platform/android/jni.cpp') diff --git a/backends/platform/android/jni.cpp b/backends/platform/android/jni.cpp index 7962fa7b4b..f23d71b2a4 100644 --- a/backends/platform/android/jni.cpp +++ b/backends/platform/android/jni.cpp @@ -28,6 +28,7 @@ #include "base/main.h" #include "base/version.h" #include "common/config-manager.h" +#include "common/error.h" #include "common/textconsole.h" #include "engines/engine.h" -- cgit v1.2.3 From a50c36d1381be2e7d0748a2c734e41357fd4920f Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 3 May 2011 14:29:01 +0200 Subject: ANDROID: Fix various forbidden symbol clashes --- backends/platform/android/jni.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'backends/platform/android/jni.cpp') diff --git a/backends/platform/android/jni.cpp b/backends/platform/android/jni.cpp index f23d71b2a4..13aef11fa2 100644 --- a/backends/platform/android/jni.cpp +++ b/backends/platform/android/jni.cpp @@ -25,6 +25,23 @@ #if defined(__ANDROID__) +// Allow use of stuff in +#define FORBIDDEN_SYMBOL_EXCEPTION_time_h + +// Disable printf override in common/forbidden.h to avoid +// clashes with log.h from the Android SDK. +// That header file uses +// __attribute__ ((format(printf, 3, 4))) +// which gets messed up by our override mechanism; this could +// be avoided by either changing the Android SDK to use the equally +// legal and valid +// __attribute__ ((format(printf, 3, 4))) +// or by refining our printf override to use a varadic macro +// (which then wouldn't be portable, though). +// Anyway, for now we just disable the printf override globally +// for the Android port +#define FORBIDDEN_SYMBOL_EXCEPTION_printf + #include "base/main.h" #include "base/version.h" #include "common/config-manager.h" -- cgit v1.2.3