From 8895adf61ea68e90f13fcfdbcef5eeb1d6c2e073 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Wed, 7 Jul 2010 14:03:14 +0300
Subject: [PATCH] Fixed compilation

---
 alienblaster/project/jni/freetype/Android.mk                | 4 ----
 .../project/jni/sdl/src/video/android/SDL_androidinput.c    | 6 +++---
 alienblaster/project/jni/sdl_image/Android.mk               | 1 -
 alienblaster/project/jni/sdl_main/Android.mk                | 2 +-
 alienblaster/project/jni/sdl_mixer/Android.mk               | 1 -
 alienblaster/project/jni/sdl_ttf/Android.mk                 | 1 -
 alienblaster/project/jni/tremor/Android.mk                  | 1 -
 7 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/alienblaster/project/jni/freetype/Android.mk b/alienblaster/project/jni/freetype/Android.mk
index 0a5483322..80825b206 100644
--- a/alienblaster/project/jni/freetype/Android.mk
+++ b/alienblaster/project/jni/freetype/Android.mk
@@ -6,17 +6,13 @@ LOCAL_MODULE := freetype
 
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
 
-# Add more subdirs here, like src/subdir1 src/subdir2
-
 LOCAL_CFLAGS := $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
 				-I$(LOCAL_PATH)/include -DFT2_BUILD_LIBRARY
 
 
-#Change C++ file extension as appropriate
 LOCAL_CPP_EXTENSION := .cpp
 
 LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.cpp))))
-# Uncomment to also add C sources
 LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c))))
 
 LOCAL_SHARED_LIBRARIES := 
diff --git a/alienblaster/project/jni/sdl/src/video/android/SDL_androidinput.c b/alienblaster/project/jni/sdl/src/video/android/SDL_androidinput.c
index 2499c090e..8080d8dc0 100644
--- a/alienblaster/project/jni/sdl/src/video/android/SDL_androidinput.c
+++ b/alienblaster/project/jni/sdl/src/video/android/SDL_androidinput.c
@@ -64,11 +64,11 @@ JAVA_EXPORT_NAME(DemoGLSurfaceView_nativeMouse) ( JNIEnv*  env, jobject  thiz, j
 {
 	if( action == MOUSE_DOWN || action == MOUSE_UP )
 	{
-		SDL_SendMouseMotion(0, x, y);
-		SDL_SendMouseButton( (action == MOUSE_DOWN) ? SDL_PRESSED : SDL_RELEASED, 1 );
+		SDL_SendMouseMotion(NULL, 0, x, y);
+		SDL_SendMouseButton(NULL, (action == MOUSE_DOWN) ? SDL_PRESSED : SDL_RELEASED, 1 );
 	}
 	if( action == MOUSE_MOVE )
-		SDL_SendMouseMotion(0, x, y);
+		SDL_SendMouseMotion(NULL, 0, x, y);
 }
 
 static SDL_scancode TranslateKey(int scancode)
diff --git a/alienblaster/project/jni/sdl_image/Android.mk b/alienblaster/project/jni/sdl_image/Android.mk
index 57535ce52..9f691baa4 100644
--- a/alienblaster/project/jni/sdl_image/Android.mk
+++ b/alienblaster/project/jni/sdl_image/Android.mk
@@ -9,7 +9,6 @@ LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../jpeg -I$(LOCAL_PATH)/../png -
 
 LOCAL_CPP_EXTENSION := .cpp
 
-# Note this simple makefile var substitution, you can find even simpler examples in different Android projects
 LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 
 LOCAL_STATIC_LIBRARIES := png jpeg
diff --git a/alienblaster/project/jni/sdl_main/Android.mk b/alienblaster/project/jni/sdl_main/Android.mk
index 0097ca197..8f62f6c6f 100644
--- a/alienblaster/project/jni/sdl_main/Android.mk
+++ b/alienblaster/project/jni/sdl_main/Android.mk
@@ -17,6 +17,6 @@ LOCAL_CPP_EXTENSION := .cpp
 LOCAL_SRC_FILES := sdl_main.c
 
 LOCAL_SHARED_LIBRARIES := sdl application
-LOCAL_LDLIBS := -llog # -Wl,-rpath=$(SDL_SHARED_LIBRARIES_PATH) # -l:$(SDL_SHARED_LIBRARIES_PATH)/libsdl.so -l:$(SDL_SHARED_LIBRARIES_PATH)/libapplication.so
+LOCAL_LDLIBS := -llog
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/alienblaster/project/jni/sdl_mixer/Android.mk b/alienblaster/project/jni/sdl_mixer/Android.mk
index a3aba59da..8091c893c 100644
--- a/alienblaster/project/jni/sdl_mixer/Android.mk
+++ b/alienblaster/project/jni/sdl_mixer/Android.mk
@@ -9,7 +9,6 @@ LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/.. -I$(LOCAL_PATH)/../sdl/includ
 
 LOCAL_CPP_EXTENSION := .cpp
 
-# Note this simple makefile var substitution, you can find even simpler examples in different Android projects
 LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 
 LOCAL_SHARED_LIBRARIES := sdl tremor
diff --git a/alienblaster/project/jni/sdl_ttf/Android.mk b/alienblaster/project/jni/sdl_ttf/Android.mk
index 887433f88..eb468b99a 100644
--- a/alienblaster/project/jni/sdl_ttf/Android.mk
+++ b/alienblaster/project/jni/sdl_ttf/Android.mk
@@ -8,7 +8,6 @@ LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl/include -I$(LOCAL_PATH)/.
 
 LOCAL_CPP_EXTENSION := .cpp
 
-# Note this simple makefile var substitution, you can find even simpler examples in different Android projects
 LOCAL_SRC_FILES := SDL_ttf.c
 
 LOCAL_SHARED_LIBRARIES := sdl
diff --git a/alienblaster/project/jni/tremor/Android.mk b/alienblaster/project/jni/tremor/Android.mk
index f668a42bc..7efdd55d5 100644
--- a/alienblaster/project/jni/tremor/Android.mk
+++ b/alienblaster/project/jni/tremor/Android.mk
@@ -8,7 +8,6 @@ LOCAL_CFLAGS := -I$(LOCAL_PATH) -DHAVE_ALLOCA_H
 
 LOCAL_CPP_EXTENSION := .cpp
 
-# Note this simple makefile var substitution, you can find even simpler examples in different Android projects
 LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 
 include $(BUILD_SHARED_LIBRARY)