integrate and link lib curl for android, add VAO support for brush draw, sync canvas with screen redraw instead of input events
This commit is contained in:
@@ -46,7 +46,7 @@ target_include_directories(native-lib PRIVATE
|
||||
../libs/tinyxml2
|
||||
../libs/yoga
|
||||
../libs/stb
|
||||
../libs/curl/android/include
|
||||
../libs/curl-android-ios/prebuilt-with-ssl/android/include
|
||||
)
|
||||
|
||||
# add lib dependencies
|
||||
@@ -54,7 +54,7 @@ target_link_libraries(
|
||||
native-lib
|
||||
android
|
||||
app-glue
|
||||
${CMAKE_SOURCE_DIR}/../libs/curl/android/armeabi-v7a/libcurl.a
|
||||
${CMAKE_SOURCE_DIR}/../libs/curl-android-ios/prebuilt-with-ssl/android/armeabi-v7a/libcurl.a
|
||||
EGL
|
||||
GLESv3
|
||||
log
|
||||
|
||||
@@ -12,7 +12,8 @@
|
||||
<activity android:name="android.app.NativeActivity"
|
||||
android:label="@string/app_name"
|
||||
android:configChanges="orientation|keyboardHidden"
|
||||
android:screenOrientation="sensorLandscape">
|
||||
android:screenOrientation="sensorLandscape"
|
||||
android:noHistory="true">
|
||||
<meta-data android:name="android.app.lib_name"
|
||||
android:value="native-lib" />
|
||||
<intent-filter>
|
||||
|
||||
@@ -257,6 +257,7 @@ static void engine_handle_cmd(struct android_app* app, int32_t cmd) {
|
||||
case APP_CMD_TERM_WINDOW:
|
||||
// The window is being hidden or closed, clean it up.
|
||||
engine_term_display(engine);
|
||||
exit(0);
|
||||
break;
|
||||
case APP_CMD_GAINED_FOCUS:
|
||||
// When our app gains focus, we start monitoring the accelerometer.
|
||||
@@ -326,7 +327,7 @@ void android_main(struct android_app* state) {
|
||||
app_dummy();
|
||||
|
||||
LOG("NETWORK TESTING...");
|
||||
curl_test();
|
||||
//curl_test();
|
||||
LOG("NETWORK TESTED");
|
||||
|
||||
memset(&engine, 0, sizeof(engine));
|
||||
|
||||
Reference in New Issue
Block a user