Merge branch 'v0.20.x'

2018-08-20 00:19:31 +02:00
parent cc64c715a2 14d3a7ae83
commit 616abdda26
19 changed files with 928 additions and 54 deletions
--- a/src/Main.hxx
+++ b/src/Main.hxx
@@ -25,7 +25,10 @@ class Context;
 struct Instance;

 #ifdef ANDROID
+#include "android/LogListener.hxx"
+
 extern Context *context;
+extern LogListener *logListener;
 #endif

 extern Instance *instance;