From 135171813f4b1965b5ffa1953b3d91df43c0eb5c Mon Sep 17 00:00:00 2001 From: Hisham Aburaqibah Date: Sun, 6 Apr 2025 11:19:41 +0200 Subject: [PATCH] move the main file to the project's root dir --- build.sh | 8 ++++---- jni/main.odin => main.odin | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename jni/main.odin => main.odin (99%) diff --git a/build.sh b/build.sh index 3175bb1..36c8eb8 100755 --- a/build.sh +++ b/build.sh @@ -2,22 +2,22 @@ ## TODO: handle different ABIs, currently only builds for arm64 -ANDROID_JBR=/home/illusion/android-studio/jbr +#ANDROID_JBR=/home/illusion/android-studio/jbr # Create a debug signing key to sign our application. if [ ! -f .keystore ]; then - "$ANDROID_JBR/bin/keytool" -genkey -dname "CN=Android Debug, O=Android, C=US" -keystore .keystore -alias androiddebugkey -storepass android -keypass android -keyalg RSA -validity 30000 + keytool -genkey -dname "CN=Android Debug, O=Android, C=US" -keystore .keystore -alias androiddebugkey -storepass android -keypass android -keyalg RSA -validity 30000 if [ $? -ne 0 ]; then exit 1; fi fi # Build the shared lib -odin build jni -target:linux_arm64 -subtarget:android -build-mode:shared +odin build . -target:linux_arm64 -subtarget:android -build-mode:shared # Create the proper lib directories and move the shared lib to them # Rename the shared lib to match what we specified in the AndroidManifest.xml file # for the android.app.lib_name metadata value mkdir -p android/lib/lib/arm64-v8a -mv jni.so android/lib/lib/arm64-v8a/libmain.so +mv android-native-example-odin.so android/lib/lib/arm64-v8a/libmain.so # Bundle the directory into an apk odin bundle android android -android-keystore:.keystore -android-keystore-password:"android" diff --git a/jni/main.odin b/main.odin similarity index 99% rename from jni/main.odin rename to main.odin index c590c19..a83140e 100644 --- a/jni/main.odin +++ b/main.odin @@ -36,7 +36,7 @@ engine_init_display :: proc "contextless" (engine: ^engine) { display := egl.GetDisplay(egl.DEFAULT_DISPLAY) if display == egl.NO_DISPLAY { - LOG(.INFO, "NativeExampleOdin", "Naterror with eglGetDisplay") + LOG(.INFO, "NativeExampleOdin", "error with eglGetDisplay") return }