fix some lambda ref, use global android_app variable instead of passing as argument, fix clipboard utf issue by using byte array

This commit is contained in:
2019-07-25 08:11:48 +02:00
parent 14e0716696
commit 5fc27ebb14
4 changed files with 143 additions and 125 deletions

View File

@@ -12,9 +12,9 @@
#include "settings.h"
#ifdef __ANDROID__
void android_async_lock(struct engine* engine);
void android_async_swap(struct engine* engine);
void android_async_unlock(struct engine* engine);
void android_async_lock();
void android_async_swap();
void android_async_unlock();
void android_attach_jni();
void android_detach_jni();
#elif _WIN32
@@ -418,7 +418,7 @@ void App::async_start()
#elif __IOS__
[ios_view async_lock];
#elif __ANDROID__
android_async_lock(and_engine);
android_async_lock();
#elif _WIN32
async_lock();
glBindFramebuffer(GL_FRAMEBUFFER, 0);
@@ -438,7 +438,7 @@ void App::async_end()
#elif __IOS__
[ios_view async_unlock];
#elif __ANDROID__
android_async_unlock(and_engine);
android_async_unlock();
#elif _WIN32
async_unlock();
#endif
@@ -451,7 +451,7 @@ void App::async_swap()
#elif __IOS__
[ios_view async_swap];
#elif __ANDROID__
android_async_swap(and_engine);
android_async_swap();
#elif _WIN32
win32_async_swap();
#endif