From 0b82bcb480a3d9d6c808f227ed11c2938fe425f8 Mon Sep 17 00:00:00 2001 From: "BADIM-PC\\Vadim" Date: Sat, 13 Jan 2018 14:58:58 +0300 Subject: [PATCH] android build reverted to SDL 2.0.5 2.0.7 doesn't run for unknown reason will fix in .70 --- build/android/AndroidManifest.xml | 2 +- build/android/default.properties | 2 +- build/android/jni/src/Android.mk | 3 ++- build/android/project.properties | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/android/AndroidManifest.xml b/build/android/AndroidManifest.xml index 55f2ace..1f8e5f0 100644 --- a/build/android/AndroidManifest.xml +++ b/build/android/AndroidManifest.xml @@ -34,7 +34,7 @@ android:hardwareAccelerated="true" > diff --git a/build/android/default.properties b/build/android/default.properties index 0a69b77..0cdab95 100644 --- a/build/android/default.properties +++ b/build/android/default.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=android-16 +target=android-12 diff --git a/build/android/jni/src/Android.mk b/build/android/jni/src/Android.mk index 72d1977..6dbed24 100644 --- a/build/android/jni/src/Android.mk +++ b/build/android/jni/src/Android.mk @@ -8,7 +8,7 @@ SRC_PATH := ../../../../src THIRD_PARTY_PATH := ../../../../../3rd-party LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/SDL2-2.0.7/include \ + $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/SDL2-2.0.5/include \ $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/lua-5.3.1/src \ $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/giflib-5.1.4/lib \ $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/zlib-1.2.8 \ @@ -20,6 +20,7 @@ LOCAL_C_INCLUDES := \ # Add your application source files here... LOCAL_SRC_FILES := \ + $(THIRD_PARTY_PATH)/SDL2-2.0.5/src/main/android/SDL_android_main.c \ $(THIRD_PARTY_PATH)/duktape-2.2.0/src/duktape.c \ $(THIRD_PARTY_PATH)/blip-buf/blip_buf.c \ $(THIRD_PARTY_PATH)/SDL2_net-2.0.1/SDLnet.c \ diff --git a/build/android/project.properties b/build/android/project.properties index 9b84a6b..0f507e5 100644 --- a/build/android/project.properties +++ b/build/android/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-16 +target=android-12