@@ -492,7 +492,7 @@ typedef enum {
492492 RPC_cmd_nativeGenerateScancodeForUnichar ,
493493
494494 // SDLControllerManager_tab
495- #ifdef GAMEPAD_AS_RPC
495+ #ifdef SDL_ANDROID_GAMEPAD_AS_RPC
496496 RPC_cmd_onNativePadDown ,
497497 RPC_cmd_onNativePadUp ,
498498 RPC_cmd_onNativeJoy ,
@@ -556,7 +556,7 @@ static const char *cmd2Str(RPC_cmd_t cmd) {
556556 CASE (nativeAddAudioDevice );
557557 CASE (nativeRemoveAudioDevice );
558558
559- #ifdef GAMEPAD_AS_RPC
559+ #ifdef SDL_ANDROID_GAMEPAD_AS_RPC
560560 // SDLControllerManager_tab
561561 CASE (onNativePadDown );
562562 CASE (onNativePadUp );
@@ -1364,7 +1364,7 @@ JNIEXPORT jboolean JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativePadDown)(
13641364#ifdef SDL_JOYSTICK_ANDROID
13651365 int button = Android_keycode_to_SDL (keycode );
13661366 if (button >= 0 ) {
1367- #ifdef GAMEPAD_AS_RPC
1367+ #ifdef SDL_ANDROID_GAMEPAD_AS_RPC
13681368 RPC_Prepare (onNativePadDown );
13691369 RPC_Add (device_id );
13701370 RPC_Add (keycode );
@@ -1395,7 +1395,7 @@ JNIEXPORT jboolean JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativePadUp)(
13951395#ifdef SDL_JOYSTICK_ANDROID
13961396 int button = Android_keycode_to_SDL (keycode );
13971397 if (button >= 0 ) {
1398- #ifdef GAMEPAD_AS_RPC
1398+ #ifdef SDL_ANDROID_GAMEPAD_AS_RPC
13991399 RPC_Prepare (onNativePadUp );
14001400 RPC_Add (device_id );
14011401 RPC_Add (keycode );
@@ -1426,7 +1426,7 @@ JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativeJoy)(
14261426 jint device_id , jint axis , jfloat value )
14271427{
14281428#ifdef SDL_JOYSTICK_ANDROID
1429- #ifdef GAMEPAD_AS_RPC
1429+ #ifdef SDL_ANDROID_GAMEPAD_AS_RPC
14301430 RPC_Prepare (onNativeJoy );
14311431 RPC_Add (device_id );
14321432 RPC_Add (axis );
@@ -1453,7 +1453,7 @@ JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativeHat)(
14531453 jint device_id , jint hat_id , jint x , jint y )
14541454{
14551455#ifdef SDL_JOYSTICK_ANDROID
1456- #ifdef GAMEPAD_AS_RPC
1456+ #ifdef SDL_ANDROID_GAMEPAD_AS_RPC
14571457 RPC_Prepare (onNativeHat );
14581458 RPC_Add (device_id );
14591459 RPC_Add (hat_id );
@@ -1490,7 +1490,7 @@ JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeAddJoystick)(
14901490 jint button_mask , jint naxes , jint axis_mask , jint nhats , jboolean can_rumble , jboolean has_rgb_led )
14911491{
14921492#ifdef SDL_JOYSTICK_ANDROID
1493- #ifdef GAMEPAD_AS_RPC
1493+ #ifdef SDL_ANDROID_GAMEPAD_AS_RPC
14941494 RPC_Prepare (nativeAddJoystick );
14951495 RPC_Add (device_id );
14961496 RPC_AddString (device_name );
@@ -1523,7 +1523,7 @@ JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeRemoveJoystick)(
15231523 jint device_id )
15241524{
15251525#ifdef SDL_JOYSTICK_ANDROID
1526- #ifdef GAMEPAD_AS_RPC
1526+ #ifdef SDL_ANDROID_GAMEPAD_AS_RPC
15271527 RPC_Prepare (nativeRemoveJoystick );
15281528 RPC_Add (device_id );
15291529 RPC_Send ;
@@ -1545,7 +1545,7 @@ JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeAddHaptic)(
15451545 JNIEnv * env , jclass jcls , jint device_id , jstring device_name )
15461546{
15471547#ifdef SDL_HAPTIC_ANDROID
1548- #ifdef GAMEPAD_AS_RPC
1548+ #ifdef SDL_ANDROID_GAMEPAD_AS_RPC
15491549 RPC_Prepare (nativeAddHaptic );
15501550 RPC_Add (device_name );
15511551 RPC_AddString (device_name );
@@ -1566,7 +1566,7 @@ JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeRemoveHaptic)(
15661566 JNIEnv * env , jclass jcls , jint device_id )
15671567{
15681568#ifdef SDL_HAPTIC_ANDROID
1569- #ifdef GAMEPAD_AS_RPC
1569+ #ifdef SDL_ANDROID_GAMEPAD_AS_RPC
15701570 RPC_Prepare (nativeRemoveHaptic );
15711571 RPC_Add (device_id );
15721572 RPC_Send ;
@@ -3726,7 +3726,7 @@ void Android_PumpRPC(SDL_Window *window)
37263726 }
37273727 break ;
37283728
3729- #ifdef GAMEPAD_AS_RPC
3729+ #ifdef SDL_ANDROID_GAMEPAD_AS_RPC
37303730 // ------------------------------
37313731 // SDLControllerManager_tab
37323732 // ------------------------------
0 commit comments