fix android compile, fix windows system info log, implement touch/stylus events on windows

This commit is contained in:
2018-10-08 21:13:44 +02:00
parent 365af43891
commit dba5eef824
9 changed files with 65 additions and 33 deletions

View File

@@ -270,7 +270,7 @@ JNIEXPORT void JNICALL Java_com_omixlab_panopainter_MainActivity_pickExternalCal
}
}
void pick_file(android_app* mApplication, std::function<void(std::string)> callback)
void android_pick_file(android_app* mApplication, std::function<void(std::string)> callback)
{
// Attaches the current thread to the JVM.
jint lResult;
@@ -941,9 +941,6 @@ static void engine_handle_cmd(struct android_app* app, int32_t cmd) {
void android_main(struct android_app* state) {
struct engine engine;
// Make sure glue isn't stripped.
app_dummy();
memset(&engine, 0, sizeof(engine));
state->userData = &engine;
state->onAppCmd = engine_handle_cmd;