update android and xcode projects, fix document title and change default resolution to 1024px

This commit is contained in:
2017-11-14 08:45:35 +00:00
parent 8bc440b9b8
commit 0d3431a9de
14 changed files with 42 additions and 28 deletions

View File

@@ -61,6 +61,7 @@ add_library(
../engine/node_canvas.cpp
../engine/node_checkbox.cpp
../engine/node_color_quad.cpp
../engine/node_combobox.cpp
../engine/node_dialog_browse.cpp
../engine/node_dialog_cloud.cpp
../engine/node_dialog_open.cpp

View File

@@ -30,7 +30,7 @@ android {
arguments '-DANDROID_PLATFORM=android-19',
'-DANDROID_TOOLCHAIN=clang',
'-DANDROID_STL=gnustl_static',
'-DCMAKE_BUILD_TYPE=Debug',
'-DCMAKE_BUILD_TYPE=Release',
'-DANDROID_ARM_NEON=TRUE'
}
}

View File

@@ -118,7 +118,6 @@ int GetUnicodeChar(struct android_app* app, int eventType, int keyCode, int meta
void android_async_lock(struct engine* engine)
{
pthread_mutex_lock(&engine->app->mutex);
LOG("lock");
eglMakeCurrent(engine->display, engine->surface, engine->surface, engine->context);
}
@@ -130,7 +129,6 @@ void android_async_swap(struct engine* engine)
void android_async_unlock(struct engine* engine)
{
eglMakeCurrent(engine->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
LOG("unlock");
pthread_mutex_unlock(&engine->app->mutex);
}