From 7f0babcdd903e315a8a7625ef1e8c5305bfab1e2 Mon Sep 17 00:00:00 2001 From: MatejMagat305 <61238240+MatejMagat305@users.noreply.github.com> Date: Sat, 23 Mar 2024 17:11:00 +0100 Subject: [PATCH] fix android platform --- raylib/platform_android.c | 1 - raylib/platform_android.go | 8 ++++++-- raylib/platforms/rcore_android.c | 6 +++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/raylib/platform_android.c b/raylib/platform_android.c index 1e5574b..beeabf7 100644 --- a/raylib/platform_android.c +++ b/raylib/platform_android.c @@ -8,5 +8,4 @@ void android_init() { struct android_app *app; app = GetAndroidApp(); asset_manager = app->activity->assetManager; - internal_storage_path = app->activity->internalDataPath; } diff --git a/raylib/platform_android.go b/raylib/platform_android.go index e80c8bc..e5c004a 100644 --- a/raylib/platform_android.go +++ b/raylib/platform_android.go @@ -7,12 +7,16 @@ package rl #include "raylib.h" #include #include +#include #include extern void android_init(); +extern struct ANativeActivity *GetANativeActivity(void); static AAssetManager* asset_manager; -static const char* internal_storage_path; +static const char* getInternalStoragePath(){ + return GetANativeActivity()->internalDataPath; +} */ import "C" @@ -133,5 +137,5 @@ func (a *asset) Close() error { } func getInternalStoragePath() string { - return C.GoString(C.internal_storage_path) + return C.GoString(C.getInternalStoragePath()) } diff --git a/raylib/platforms/rcore_android.c b/raylib/platforms/rcore_android.c index e0b7fd2..d2f8d50 100644 --- a/raylib/platforms/rcore_android.c +++ b/raylib/platforms/rcore_android.c @@ -50,7 +50,6 @@ #include // Required for: AWINDOW_FLAG_FULLSCREEN definition and others //#include // Required for: Android sensors functions (accelerometer, gyroscope, light...) #include // Required for: JNIEnv and JavaVM [Used in OpenURL()] - #include // Native platform windowing system interface //---------------------------------------------------------------------------------- @@ -134,6 +133,11 @@ struct android_app *GetAndroidApp(void) return platform.app; } +extern struct ANativeActivity *GetANativeActivity(void) +{ + return platform.app->activity; +} + //---------------------------------------------------------------------------------- // Module Functions Definition: Window and Graphics Device //----------------------------------------------------------------------------------