--- a/misc/physfs/src/Android.mk	Fri Feb 01 20:15:22 2013 -0500
+++ b/misc/physfs/src/Android.mk	Sat Feb 02 14:22:57 2013 +0100
@@ -6,7 +6,7 @@
 
 LOCAL_CFLAGS := -O2 -DPHYSFS_NO_CDROM_SUPPORT 
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(MISC_DIR)/liblua $(MISC_DIR)/liblua $(JNI_DIR)/SDL/include
 
 LOCAL_SRC_FILES :=    physfs.c \
     physfs_byteorder.c \
@@ -26,5 +26,7 @@
     ../extras/hwpacksmounter.c \
     ../extras/physfslualoader.c \
     ../extras/physfsrwops.c \
+
+LOCAL_SHARED_LIBRARIES += SDL lua
     
 include $(BUILD_SHARED_LIBRARY)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/Android-build/SDL-android-project/jni/jnidispatch/Android.mk	Sat Feb 02 14:22:57 2013 +0100
@@ -0,0 +1,6 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libjnidispatch
+LOCAL_SRC_FILES := libjnidispatch.so
+include $(PREBUILT_SHARED_LIBRARY)
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/Android-build/SDL-android-project/jni/jnidispatch/README	Sat Feb 02 14:22:57 2013 +0100
@@ -0,0 +1,1 @@
+This library is part of JNA and just needs to be copied into the libs/armeabi folder. However, putting it there directly will get it cleaned away on build.
\ No newline at end of file

Binary file project_files/Android-build/SDL-android-project/jni/jnidispatch/libjnidispatch.so has changed

--- a/project_files/Android-build/SDL-android-project/jni/src/hedgewars_main.c	Fri Feb 01 20:15:22 2013 -0500
+++ b/project_files/Android-build/SDL-android-project/jni/src/hedgewars_main.c	Sat Feb 02 14:22:57 2013 +0100
@@ -1,3 +1,4 @@
+#include<stdint.h>
 
 #include "android/log.h"
 #include "SDL.h"
@@ -6,7 +7,7 @@
 
 #define TAG "HWEngine Loader"
 
-typedef  (*HWEngine_Game)(char**);
+typedef  (*HWEngine_Game)(int32_t argc, char** argv);
 
 main(int argc, char *argv[]){
 	void *handle;
@@ -33,7 +34,7 @@
 		exit(EXIT_FAILURE);
 	}
 	__android_log_print(ANDROID_LOG_INFO, TAG, "dlsym succeeded");
-	Game(argv);
+	Game(argc, argv);
 	__android_log_print(ANDROID_LOG_INFO, TAG, "Game() ended");
 
 	dlclose(handle);

Binary file project_files/Android-build/SDL-android-project/libs/armeabi/libjnidispatch.so has changed