From ac1278c727287fe02b05f5c7d6b470434d159043 Mon Sep 17 00:00:00 2001 From: DeexCoding Date: Tue, 29 Nov 2022 22:20:41 +0100 Subject: [PATCH 1/2] Updated project, because it did not work, but it came at the cost of compatibility --- AndroidManifest.xml | 2 +- a.cmd | 8 +++++--- jni/Application.mk | 2 +- jni/main.c | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1c4b617..47e05f3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -4,7 +4,7 @@ android:versionCode="1" android:versionName="1.0"> - + diff --git a/a.cmd b/a.cmd index 4b2b0b6..05cb2d3 100644 --- a/a.cmd +++ b/a.cmd @@ -2,9 +2,11 @@ set APK=NativeExample.apk -if "%ANDROID_NDK%" equ "" set ANDROID_NDK=C:\android\ndk -if "%ANDROID_SDK%" equ "" set ANDROID_SDK=C:\android\sdk -if "%JAVA_JDK%" equ "" set JAVA_JDK=C:\Program Files\Java\jdk1.8.0_102 +rem In the new Android Studio the sdk has been moved to C:\Users\[username]\AppData\Local\Android\Sdk and the ndk to C:\Users\[username]\AppData\Local\Android\Sdk\ndk\[ndk version], so it's harder to get a default directory + +rem if "%ANDROID_NDK%" equ "" set ANDROID_NDK=C:\android\ndk +rem if "%ANDROID_SDK%" equ "" set ANDROID_SDK=C:\android\sdk +rem if "%JAVA_JDK%" equ "" set JAVA_JDK=C:\Program Files\Java\jdk1.8.0_102 call :check || exit /b 1 diff --git a/jni/Application.mk b/jni/Application.mk index 650082a..b1527c7 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,7 +1,7 @@ # https://developer.android.com/ndk/guides/application_mk.html NDK_TOOLCHAIN_VERSION := clang -APP_PLATFORM := android-10 +APP_PLATFORM := android-23 APP_OPTIM := release APP_ABI := armeabi-v7a # arm64-v8a x86 diff --git a/jni/main.c b/jni/main.c index 4af74a5..bf3a105 100644 --- a/jni/main.c +++ b/jni/main.c @@ -7,6 +7,8 @@ #include #include +#include + #define LOG(...) ((void)__android_log_print(ANDROID_LOG_INFO, "NativeExample", __VA_ARGS__)) struct engine @@ -243,8 +245,6 @@ static void engine_handle_cmd(struct android_app* app, int32_t cmd) void android_main(struct android_app* state) { - app_dummy(); - struct engine engine; memset(&engine, 0, sizeof(engine)); From c3f11273bb79fc9f0b80158c829c34f1979595e2 Mon Sep 17 00:00:00 2001 From: DeexCoding Date: Tue, 20 Dec 2022 17:02:49 +0100 Subject: [PATCH 2/2] Re added ndk, sdk, jdk default locations --- a.cmd | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/a.cmd b/a.cmd index 05cb2d3..4b2b0b6 100644 --- a/a.cmd +++ b/a.cmd @@ -2,11 +2,9 @@ set APK=NativeExample.apk -rem In the new Android Studio the sdk has been moved to C:\Users\[username]\AppData\Local\Android\Sdk and the ndk to C:\Users\[username]\AppData\Local\Android\Sdk\ndk\[ndk version], so it's harder to get a default directory - -rem if "%ANDROID_NDK%" equ "" set ANDROID_NDK=C:\android\ndk -rem if "%ANDROID_SDK%" equ "" set ANDROID_SDK=C:\android\sdk -rem if "%JAVA_JDK%" equ "" set JAVA_JDK=C:\Program Files\Java\jdk1.8.0_102 +if "%ANDROID_NDK%" equ "" set ANDROID_NDK=C:\android\ndk +if "%ANDROID_SDK%" equ "" set ANDROID_SDK=C:\android\sdk +if "%JAVA_JDK%" equ "" set JAVA_JDK=C:\Program Files\Java\jdk1.8.0_102 call :check || exit /b 1