Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

2017-01-29 19:28:08 +01:00
parent f5d7f52196 d050f3d3cd
commit 23522adf4e
2 changed files with 6 additions and 0 deletions
--- a/project/jni/sdl-1.2/include/SDL_android.h
+++ b/project/jni/sdl-1.2/include/SDL_android.h
@@ -148,6 +148,8 @@ extern DECLSPEC void SDLCALL SDL_ANDROID_SetMouseEmulationMode(
 	int forceHardwareMouse, int showScreenUnderFinger,
 	int fingerHover, int fingerHoverJitterFilter, int generateSubframeTouchEvents
 );
+	
+extern DECLSPEC int SDLCALL SDL_ANDROID_GetMouseEmulationMode();

 #ifdef __cplusplus
 }
--- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
+++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
@@ -1200,6 +1200,10 @@ void SDLCALL SDL_ANDROID_SetMouseEmulationMode(
 	}
 }

+int SDLCALL SDL_ANDROID_GetMouseEmulationMode() {
+    return relativeMovement;
+}
+
 typedef struct
 {
 		int leftClickMethod;