UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-19 05:40:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion/sdl/android] Fix the build

Browse Source
This commit is contained in:
Romain Goyet
2019-03-20 17:53:06 +01:00
parent 94122934c7
commit 91cad805c1
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ion/src/sdl/android/Makefile
View File

@@ -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

2
ion/src/sdl/android/src/cpp/images.cpp
View File

@@ -3,7 +3,7 @@
#include <jni.h>
#include <android/bitmap.h>
SDL_Texture * IonSDLPlatformGetLanguageCode(SDL_Renderer * renderer, const char * identifier) {
SDL_Texture * IonSDLPlatformLoadImage(SDL_Renderer * renderer, const char * identifier) {
JNIEnv * env = static_cast<JNIEnv *>(SDL_AndroidGetJNIEnv());
jobject activity = static_cast<jobject>(SDL_AndroidGetActivity());

2
ion/src/sdl/android/src/cpp/language.cpp
View File

@@ -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;

4
ion/src/sdl/android/src/cpp/telemetry.cpp
View File

@@ -7,7 +7,7 @@ void IonSDLPlatformTelemetryInit() {
jobject activity = static_cast<jobject>(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<jobject>(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);