Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-27 10:57:22 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix various places where nativeSetupJNI being treated as returning int

Browse Source
This commit is contained in:
Brenton Bostick
2025-09-22 08:25:56 -04:00
committed by Sam Lantinga
parent 6590a5bc0b
commit 8d86ee4995
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+1 -1
View File
@@ -1043,7 +1043,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
// C functions we call // C functions we call
public static native String nativeGetVersion(); public static native String nativeGetVersion();
public static native int nativeSetupJNI(); public static native void nativeSetupJNI();
public static native void nativeInitMainThread(); public static native void nativeInitMainThread();
public static native void nativeCleanupMainThread(); public static native void nativeCleanupMainThread();
public static native int nativeRunMain(String library, String function, Object arguments); public static native int nativeRunMain(String library, String function, Object arguments);
android-project/app/src/main/java/org/libsdl/app/SDLAudioManager.java
+1 -1
View File
@@ -117,7 +117,7 @@ class SDLAudioManager {
} }
} }
static native int nativeSetupJNI(); static native void nativeSetupJNI();
static native void nativeRemoveAudioDevice(boolean recording, int deviceId); static native void nativeRemoveAudioDevice(boolean recording, int deviceId);
android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
+1 -1
View File
@@ -20,7 +20,7 @@ import android.view.View;
public class SDLControllerManager public class SDLControllerManager
{ {
static native int nativeSetupJNI(); static native void nativeSetupJNI();
static native void nativeAddJoystick(int device_id, String name, String desc, static native void nativeAddJoystick(int device_id, String name, String desc,
int vendor_id, int product_id, int vendor_id, int product_id,
src/core/android/SDL_android.c
+3 -3
View File
@@ -198,7 +198,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeFileDialog)(
static JNINativeMethod SDLActivity_tab[] = { static JNINativeMethod SDLActivity_tab[] = {
{ "nativeGetVersion", "()Ljava/lang/String;", SDL_JAVA_INTERFACE(nativeGetVersion) }, { "nativeGetVersion", "()Ljava/lang/String;", SDL_JAVA_INTERFACE(nativeGetVersion) },
{ "nativeSetupJNI", "()I", SDL_JAVA_INTERFACE(nativeSetupJNI) }, { "nativeSetupJNI", "()V", SDL_JAVA_INTERFACE(nativeSetupJNI) },
{ "nativeInitMainThread", "()V", SDL_JAVA_INTERFACE(nativeInitMainThread) }, { "nativeInitMainThread", "()V", SDL_JAVA_INTERFACE(nativeInitMainThread) },
{ "nativeCleanupMainThread", "()V", SDL_JAVA_INTERFACE(nativeCleanupMainThread) }, { "nativeCleanupMainThread", "()V", SDL_JAVA_INTERFACE(nativeCleanupMainThread) },
{ "nativeRunMain", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)I", SDL_JAVA_INTERFACE(nativeRunMain) }, { "nativeRunMain", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)I", SDL_JAVA_INTERFACE(nativeRunMain) },
@@ -265,7 +265,7 @@ JNIEXPORT void JNICALL
jint device_id); jint device_id);
static JNINativeMethod SDLAudioManager_tab[] = { static JNINativeMethod SDLAudioManager_tab[] = {
{ "nativeSetupJNI", "()I", SDL_JAVA_AUDIO_INTERFACE(nativeSetupJNI) }, { "nativeSetupJNI", "()V", SDL_JAVA_AUDIO_INTERFACE(nativeSetupJNI) },
{ "nativeAddAudioDevice", "(ZLjava/lang/String;I)V", SDL_JAVA_AUDIO_INTERFACE(nativeAddAudioDevice) }, { "nativeAddAudioDevice", "(ZLjava/lang/String;I)V", SDL_JAVA_AUDIO_INTERFACE(nativeAddAudioDevice) },
{ "nativeRemoveAudioDevice", "(ZI)V", SDL_JAVA_AUDIO_INTERFACE(nativeRemoveAudioDevice) } { "nativeRemoveAudioDevice", "(ZI)V", SDL_JAVA_AUDIO_INTERFACE(nativeRemoveAudioDevice) }
}; };
@@ -308,7 +308,7 @@ JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeRemoveHaptic)(
jint device_id); jint device_id);
static JNINativeMethod SDLControllerManager_tab[] = { static JNINativeMethod SDLControllerManager_tab[] = {
{ "nativeSetupJNI", "()I", SDL_JAVA_CONTROLLER_INTERFACE(nativeSetupJNI) }, { "nativeSetupJNI", "()V", SDL_JAVA_CONTROLLER_INTERFACE(nativeSetupJNI) },
{ "onNativePadDown", "(II)Z", SDL_JAVA_CONTROLLER_INTERFACE(onNativePadDown) }, { "onNativePadDown", "(II)Z", SDL_JAVA_CONTROLLER_INTERFACE(onNativePadDown) },
{ "onNativePadUp", "(II)Z", SDL_JAVA_CONTROLLER_INTERFACE(onNativePadUp) }, { "onNativePadUp", "(II)Z", SDL_JAVA_CONTROLLER_INTERFACE(onNativePadUp) },
{ "onNativeJoy", "(IIF)V", SDL_JAVA_CONTROLLER_INTERFACE(onNativeJoy) }, { "onNativeJoy", "(IIF)V", SDL_JAVA_CONTROLLER_INTERFACE(onNativeJoy) },