diff --git a/ion/src/sdl/android/Makefile b/ion/src/sdl/android/Makefile index 0492d3efa..4b028d32c 100644 --- a/ion/src/sdl/android/Makefile +++ b/ion/src/sdl/android/Makefile @@ -1,5 +1,7 @@ src += $(addprefix ion/src/sdl/android/src/cpp/, \ images.cpp \ + language.cpp \ + telemetry.cpp \ ) $(call object_for,ion/src/sdl/shared/main.cpp) : SFLAGS += -DEPSILON_SDL_FULLSCREEN=1 diff --git a/ion/src/sdl/android/src/cpp/images.cpp b/ion/src/sdl/android/src/cpp/images.cpp index d732730cf..638bd77e5 100644 --- a/ion/src/sdl/android/src/cpp/images.cpp +++ b/ion/src/sdl/android/src/cpp/images.cpp @@ -3,7 +3,7 @@ #include #include -SDL_Texture * IonSDLPlatformGetLanguageCode(SDL_Renderer * renderer, const char * identifier) { +SDL_Texture * IonSDLPlatformLoadImage(SDL_Renderer * renderer, const char * identifier) { JNIEnv * env = static_cast(SDL_AndroidGetJNIEnv()); jobject activity = static_cast(SDL_AndroidGetActivity()); diff --git a/ion/src/sdl/android/src/cpp/language.cpp b/ion/src/sdl/android/src/cpp/language.cpp index 754cfef39..f8cba9556 100644 --- a/ion/src/sdl/android/src/cpp/language.cpp +++ b/ion/src/sdl/android/src/cpp/language.cpp @@ -1,6 +1,6 @@ #include "../../../shared/platform.h" -const char * IonSDLPlatformGetLanguageCode() { +char * IonSDLPlatformGetLanguageCode() { // The Android NDK cannot retrieve the current locale // This will be handled by the Java side return nullptr; diff --git a/ion/src/sdl/android/src/cpp/telemetry.cpp b/ion/src/sdl/android/src/cpp/telemetry.cpp index 3ae8bb9e9..d081ea88d 100644 --- a/ion/src/sdl/android/src/cpp/telemetry.cpp +++ b/ion/src/sdl/android/src/cpp/telemetry.cpp @@ -7,7 +7,7 @@ void IonSDLPlatformTelemetryInit() { jobject activity = static_cast(SDL_AndroidGetActivity()); jclass j_class = env->FindClass("com/numworks/calculator/EpsilonActivity"); - jmethodID j_methodId = env->GetMethodID(j_class,"telemetryInit", "(V)V"); + jmethodID j_methodId = env->GetMethodID(j_class,"telemetryInit", "()V"); env->CallVoidMethod(activity, j_methodId); } @@ -17,7 +17,7 @@ void IonSDLPlatformTelemetryEvent(const char * eventName) { jobject activity = static_cast(SDL_AndroidGetActivity()); jclass j_class = env->FindClass("com/numworks/calculator/EpsilonActivity"); - jmethodID j_methodId = env->GetMethodID(j_class,"telemetryEvent", "(V)Ljava/lang/String;"); + jmethodID j_methodId = env->GetMethodID(j_class,"telemetryEvent", "(Ljava/lang/String;)V"); jstring j_eventName = env->NewStringUTF(eventName);