diff --git a/.classpath b/.classpath
index 7bc01d9a..51769745 100644
--- a/.classpath
+++ b/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/.project b/.project
index a5193381..5b594af1 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>SDLActivity</name>
+	<name>love_android_sdl2</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/jni/devil-1.7.8/Android.mk b/jni/devil-1.7.8/Android.mk
index e644614f..c602188c 100644
--- a/jni/devil-1.7.8/Android.mk
+++ b/jni/devil-1.7.8/Android.mk
@@ -22,9 +22,10 @@ LOCAL_C_INCLUDES  :=  \
 LOCAL_SRC_FILES := \
 	$(filter-out \
 	,$(subst $(LOCAL_PATH)/,,\
-	$(wildcard ${LOCAL_PATH}/src-IL/src/*.c) ))
+	$(wildcard ${LOCAL_PATH}/src-IL/src/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src-IL/src/*.c) ))
 
-$(info libdevil: include dirs $(LOCAL_C_INCLUDES))
-$(info libdevil: src files $(LOCAL_SRC_FILES))
+# $(info libdevil: include dirs $(LOCAL_C_INCLUDES))
+# $(info libdevil: src files $(LOCAL_SRC_FILES))
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/freetype2-android/Android.mk b/jni/freetype2-android/Android.mk
index b6596467..3798111e 100644
--- a/jni/freetype2-android/Android.mk
+++ b/jni/freetype2-android/Android.mk
@@ -16,16 +16,18 @@ LOCAL_C_INCLUDES  :=  \
 LOCAL_SRC_FILES := \
 	$(filter-out \
 	,$(subst $(LOCAL_PATH)/,,\
-	${LOCAL_PATH}/src/autofit/autofit.c \
 	$(wildcard ${LOCAL_PATH}/src/base/*.c) \
-	$(wildcard ${LOCAL_PATH}/src/pshinter/*.c) \
-	$(wildcard ${LOCAL_PATH}/src/psnames/*.c) \
-	$(wildcard ${LOCAL_PATH}/src/raster/*.c) \
-	$(wildcard ${LOCAL_PATH}/src/sfnt/*.c) \
-	$(wildcard ${LOCAL_PATH}/src/smooth/*.c) \
-	$(wildcard ${LOCAL_PATH}/src/truetype/*.c) ))
+	${LOCAL_PATH}/src/autofit/autofit.c \
+	${LOCAL_PATH}/src/cff/cff.c \
+	${LOCAL_PATH}/src/pshinter/pshinter.c \
+	${LOCAL_PATH}/src/psnames/psnames.c \
+	${LOCAL_PATH}/src/raster/raster.c \
+	${LOCAL_PATH}/src/sfnt/sfnt.c \
+	${LOCAL_PATH}/src/smooth/smooth.c \
+	${LOCAL_PATH}/src/truetype/truetype.c \
+  ))
 
-$(info libfreetype: include dirs $(LOCAL_C_INCLUDES))
-$(info libfreetype: src files $(LOCAL_SRC_FILES))
+# $(info libfreetype: include dirs $(LOCAL_C_INCLUDES))
+# $(info libfreetype: src files $(LOCAL_SRC_FILES))
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/jasper-1.900.1/Android.mk b/jni/jasper-1.900.1/Android.mk
index 70270b12..cda43987 100644
--- a/jni/jasper-1.900.1/Android.mk
+++ b/jni/jasper-1.900.1/Android.mk
@@ -15,6 +15,7 @@ LOCAL_C_INCLUDES  :=  \
 		
 LOCAL_SRC_FILES := \
 	$(filter-out \
+		src/libjasper/jpg/jpg_dummy.c \
 	,$(subst $(LOCAL_PATH)/,,\
 	$(wildcard ${LOCAL_PATH}/src/libjasper/*.c) \
 	$(wildcard ${LOCAL_PATH}/src/libjasper/jpc/*.c) \
@@ -27,7 +28,7 @@ LOCAL_SRC_FILES := \
 	$(wildcard ${LOCAL_PATH}/src/libjasper/mif/*.c) \
 	$(wildcard ${LOCAL_PATH}/src/libjasper/base/*.c) ))
 
-$(info libjasper: include dirs $(LOCAL_C_INCLUDES))
-$(info libjasper: src files $(LOCAL_SRC_FILES))
+# $(info libjasper: include dirs $(LOCAL_C_INCLUDES))
+# $(info libjasper: src files $(LOCAL_SRC_FILES))
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/jpeg-8c/Android.mk b/jni/jpeg-8c/Android.mk
index 60ae6af0..ace599b5 100644
--- a/jni/jpeg-8c/Android.mk
+++ b/jni/jpeg-8c/Android.mk
@@ -19,7 +19,7 @@ LOCAL_SRC_FILES := \
   , $(subst $(LOCAL_PATH)/,,\
 	$(wildcard ${LOCAL_PATH}/*.c) ))
 
-$(info libjpeg: include dirs $(LOCAL_C_INCLUDES))
-$(info libjpeg: src files $(LOCAL_SRC_FILES))
+# $(info libjpeg: include dirs $(LOCAL_C_INCLUDES))
+# $(info libjpeg: src files $(LOCAL_SRC_FILES))
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/lcms2-2.2/Android.mk b/jni/lcms2-2.2/Android.mk
index 51d612fb..ef6f5c77 100644
--- a/jni/lcms2-2.2/Android.mk
+++ b/jni/lcms2-2.2/Android.mk
@@ -17,7 +17,7 @@ LOCAL_SRC_FILES := \
 	,$(subst $(LOCAL_PATH)/,,\
 	$(wildcard ${LOCAL_PATH}/src/*.c) ))
 
-$(info liblcms: include dirs $(LOCAL_C_INCLUDES))
-$(info liblcms: src files $(LOCAL_SRC_FILES))
+# $(info liblcms: include dirs $(LOCAL_C_INCLUDES))
+# $(info liblcms: src files $(LOCAL_SRC_FILES))
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/libmng-1.0.10/Android.mk b/jni/libmng-1.0.10/Android.mk
index f5449797..383cb119 100644
--- a/jni/libmng-1.0.10/Android.mk
+++ b/jni/libmng-1.0.10/Android.mk
@@ -18,7 +18,7 @@ LOCAL_SRC_FILES := \
   , $(subst $(LOCAL_PATH)/,,\
 	$(wildcard ${LOCAL_PATH}/*.c) ))
 
-$(info libmng: include dirs $(LOCAL_C_INCLUDES))
-$(info libmng: src files $(LOCAL_SRC_FILES))
+# $(info libmng: include dirs $(LOCAL_C_INCLUDES))
+# $(info libmng: src files $(LOCAL_SRC_FILES))
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/libmodplug-0.8.8.4/Android.mk b/jni/libmodplug-0.8.8.4/Android.mk
index 0696eecc..5a6beb7c 100644
--- a/jni/libmodplug-0.8.8.4/Android.mk
+++ b/jni/libmodplug-0.8.8.4/Android.mk
@@ -16,7 +16,7 @@ LOCAL_SRC_FILES := \
   , $(subst $(LOCAL_PATH)/,,\
 	$(wildcard ${LOCAL_PATH}/src/*.cpp) ))
 
-$(info libmodplug: include dirs $(LOCAL_C_INCLUDES))
-$(info libmodplug: src files $(LOCAL_SRC_FILES))
+# $(info libmodplug: include dirs $(LOCAL_C_INCLUDES))
+# $(info libmodplug: src files $(LOCAL_SRC_FILES))
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/libogg-1.3.0/Android.mk b/jni/libogg-1.3.0/Android.mk
index c196f63a..0c218727 100644
--- a/jni/libogg-1.3.0/Android.mk
+++ b/jni/libogg-1.3.0/Android.mk
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := \
 	${LOCAL_PATH}/src/framing.c \
 	${LOCAL_PATH}/src/bitwise.c )
 
-$(info local includes $(LOCAL_C_INCLUDES))
+# $(info local includes $(LOCAL_C_INCLUDES))
 
 include $(BUILD_STATIC_LIBRARY)
 
diff --git a/jni/libpng-1.5.6/Android.mk b/jni/libpng-1.5.6/Android.mk
index 215b456f..1ee54942 100644
--- a/jni/libpng-1.5.6/Android.mk
+++ b/jni/libpng-1.5.6/Android.mk
@@ -17,7 +17,7 @@ LOCAL_SRC_FILES := \
 	,$(subst $(LOCAL_PATH)/,,\
 	$(wildcard ${LOCAL_PATH}/*.c) ))
 
-$(info libpng: include dirs $(LOCAL_C_INCLUDES))
-$(info libpng: src files $(LOCAL_SRC_FILES))
+# $(info libpng: include dirs $(LOCAL_C_INCLUDES))
+# $(info libpng: src files $(LOCAL_SRC_FILES))
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/libvorbis-1.3.2/Android.mk b/jni/libvorbis-1.3.2/Android.mk
index f0d42698..73fede02 100644
--- a/jni/libvorbis-1.3.2/Android.mk
+++ b/jni/libvorbis-1.3.2/Android.mk
@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := \
 	$(filter-out lib/psytune.c lib/vorbisenc.c, $(subst $(LOCAL_PATH)/,,\
 	$(wildcard ${LOCAL_PATH}/lib/*.c) ))
 
-$(info libvorbis: include dirs $(LOCAL_C_INCLUDES))
-$(info libvorbis: src files $(LOCAL_SRC_FILES))
+# $(info libvorbis: include dirs $(LOCAL_C_INCLUDES))
+# $(info libvorbis: src files $(LOCAL_SRC_FILES))
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/love/Android.mk b/jni/love/Android.mk
new file mode 100644
index 00000000..ff191339
--- /dev/null
+++ b/jni/love/Android.mk
@@ -0,0 +1,107 @@
+LOCAL_PATH:= $(call my-dir)
+
+# libogg
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := liblove
+LOCAL_CFLAGS    := -fexceptions -g -Dlinux -Dunix \
+	-DHAVE_GCC_DESTRUCTOR=1 -DOPT_GENERIC -DREAL_IS_FLOAT 
+
+LOCAL_CPPFLAGS  := ${LOCAL_CFLAGS} 
+
+LOCAL_C_INCLUDES  :=  \
+	${LOCAL_PATH}/src \
+	${LOCAL_PATH}/src/modules \
+	${LOCAL_PATH}/src/libraries/ \
+	${LOCAL_PATH}/src/libraries/enet/libenet/include \
+	${LOCAL_PATH}/../SDL2-2.0.1/include \
+	${LOCAL_PATH}/../devil-1.7.8/include \
+	${LOCAL_PATH}/../devil-1.7.8/src-IL/include \
+	${LOCAL_PATH}/../jasper-1.900.1/src/libjasper/include \
+	${LOCAL_PATH}/../libpng-1.5.6/ \
+	${LOCAL_PATH}/../libmng-1.0.10/ \
+	${LOCAL_PATH}/../jpeg-8c/ \
+	${LOCAL_PATH}/../lcms2-2.2/include \
+	${LOCAL_PATH}/../tiff-3.9.5/libtiff \
+	${LOCAL_PATH}/../openal-soft-android/include \
+	${LOCAL_PATH}/../openal-soft-android/OpenAL32/Include \
+	${LOCAL_PATH}/../freetype2-android/include \
+	${LOCAL_PATH}/../freetype2-android/src \
+	${LOCAL_PATH}/../physfs-2.0.2 \
+	${LOCAL_PATH}/../mpg123-1.13.4/src/libmpg123 \
+	${LOCAL_PATH}/../libmodplug-0.8.8.4/src \
+	${LOCAL_PATH}/../libvorbis-1.3.2/include \
+	${LOCAL_PATH}/../lua-5.1.4/src \
+	${LOCAL_PATH}/../libogg-1.3.0/include 
+		
+LOCAL_SRC_FILES := \
+	$(filter-out \
+	  src/libraries/luasocket/libluasocket/wsocket.c \
+	,$(subst $(LOCAL_PATH)/,,\
+	$(wildcard ${LOCAL_PATH}/src/love.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/common/*.cpp) \
+	$(wildcard ${LOCAL_PATH}/src/modules/audio/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/audio/null/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/audio/openal/*.cpp) \
+	$(wildcard ${LOCAL_PATH}/src/modules/event/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/event/sdl/*.cpp) \
+	$(wildcard ${LOCAL_PATH}/src/modules/filesystem/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/filesystem/physfs/*.cpp) \
+	$(wildcard ${LOCAL_PATH}/src/modules/font/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/font/freetype/*.cpp) \
+	$(wildcard ${LOCAL_PATH}/src/modules/graphics/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/graphics/opengl/*.cpp) \
+	$(wildcard ${LOCAL_PATH}/src/modules/image/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/image/magpie/*.cpp) \
+	$(wildcard ${LOCAL_PATH}/src/modules/joystick/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/joystick/sdl/*.cpp) \
+	$(wildcard ${LOCAL_PATH}/src/modules/keyboard/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/keyboard/sdl/*.cpp) \
+	$(wildcard ${LOCAL_PATH}/src/modules/love/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/math/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/mouse/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/mouse/sdl/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/physics/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/physics/box2d/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/sound/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/sound/lullaby/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/system/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/system/sdl/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/thread/*.cpp) \
+ 	$(wildcard ${LOCAL_PATH}/src/modules/thread/sdl/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/modules/timer/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/modules/timer/sdl/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/modules/window/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/modules/window/sdl/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/ddsparse/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/Box2D/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/Box2D/Collision/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/Box2D/Collision/Shapes/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/Box2D/Common/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/Box2D/Dynamics/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/Box2D/Dynamics/Contacts/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/Box2D/Dynamics/Joints/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/Box2D/Rope/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/glad/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/enet/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/enet/libenet/*.c) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/luasocket/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/luasocket/libluasocket/*.c) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/noise1234/*.cpp) \
+  $(wildcard ${LOCAL_PATH}/src/libraries/Wuff/*.c) \
+  ))
+
+LOCAL_CXXFLAGS := -std=c++0x
+
+LOCAL_SHARED_LIBRARIES := SDL2 libphysfs liblua libvorbis libogg  libopenal libmpg123 libmodplug libdevil libtiff libmng libfreetype liblcms libjasper libpng libjpeg 
+
+# $(info liblove: include dirs $(LOCAL_C_INCLUDES))
+# $(info liblove: src files $(LOCAL_SRC_FILES))
+
+SDL_PATH := ../SDL2-2.0.1
+LOCAL_SRC_FILES += $(SDL_PATH)/src/main/android/SDL_android_main.c \
+LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog 
+
+LOCAL_LDFLAGS := -lz
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/love/src/libraries/Box2D/Collision/Shapes/b2ChainShape.cpp b/jni/love/src/libraries/Box2D/Collision/Shapes/b2ChainShape.cpp
index 069b4cae..25af2415 100755
--- a/jni/love/src/libraries/Box2D/Collision/Shapes/b2ChainShape.cpp
+++ b/jni/love/src/libraries/Box2D/Collision/Shapes/b2ChainShape.cpp
@@ -20,6 +20,7 @@
 #include <Box2D/Collision/Shapes/b2EdgeShape.h>
 #include <new>
 #include <memory.h>
+#include <cstring>
 
 b2ChainShape::~b2ChainShape()
 {
diff --git a/jni/love/src/libraries/Box2D/Collision/b2DynamicTree.cpp b/jni/love/src/libraries/Box2D/Collision/b2DynamicTree.cpp
index 7035ab8b..2ccb2d94 100755
--- a/jni/love/src/libraries/Box2D/Collision/b2DynamicTree.cpp
+++ b/jni/love/src/libraries/Box2D/Collision/b2DynamicTree.cpp
@@ -18,6 +18,7 @@
 
 #include <Box2D/Collision/b2DynamicTree.h>
 #include <memory.h>
+#include <cstring>
 
 b2DynamicTree::b2DynamicTree()
 {
diff --git a/jni/love/src/libraries/Box2D/Common/b2BlockAllocator.cpp b/jni/love/src/libraries/Box2D/Common/b2BlockAllocator.cpp
index f7a4688e..af81a593 100755
--- a/jni/love/src/libraries/Box2D/Common/b2BlockAllocator.cpp
+++ b/jni/love/src/libraries/Box2D/Common/b2BlockAllocator.cpp
@@ -20,6 +20,7 @@
 #include <limits.h>
 #include <memory.h>
 #include <stddef.h>
+#include <cstring>
 
 int32 b2BlockAllocator::s_blockSizes[b2_blockSizes] = 
 {
diff --git a/jni/love/src/love.cpp b/jni/love/src/love.cpp
index 6f9a666b..f0a26cc1 100644
--- a/jni/love/src/love.cpp
+++ b/jni/love/src/love.cpp
@@ -20,6 +20,7 @@
 
 #include "modules/love/love.h"
 #include <SDL.h>
+#include <SDL_opengles.h>
 
 #ifdef LOVE_BUILD_EXE
 
@@ -135,6 +136,11 @@ static int love_preload(lua_State *L, lua_CFunction f, const char *name)
 
 int main(int argc, char **argv)
 {
+
+   SDL_LogSetAllPriority(SDL_LOG_PRIORITY_VERBOSE);
+   SDL_Log ("Hello from love main");
+
+
 #ifdef LOVE_LEGENDARY_UTF8_ARGV_HACK
 	int hack_argc = 0;	char **hack_argv = 0;
 	get_utf8_arguments(hack_argc, hack_argv);
diff --git a/jni/love/src/modules/sound/lullaby/ModPlugDecoder.h b/jni/love/src/modules/sound/lullaby/ModPlugDecoder.h
index 30c9685e..86f1a3cb 100644
--- a/jni/love/src/modules/sound/lullaby/ModPlugDecoder.h
+++ b/jni/love/src/modules/sound/lullaby/ModPlugDecoder.h
@@ -26,7 +26,7 @@
 #include "Decoder.h"
 
 // SDL_sound
-#include <libmodplug/modplug.h>
+#include <modplug.h>
 
 namespace love
 {
diff --git a/jni/mpg123-1.13.4/Android.mk b/jni/mpg123-1.13.4/Android.mk
index a9015890..270b68bf 100644
--- a/jni/mpg123-1.13.4/Android.mk
+++ b/jni/mpg123-1.13.4/Android.mk
@@ -12,14 +12,14 @@ LOCAL_C_INCLUDES  :=  \
 		
 LOCAL_SRC_FILES := \
 	$(filter-out \
-	  src/libmpg123/dct64_altivec.c src/libmpg123/dct64.c \
+	  src/libmpg123/dct64_altivec.c \
 		src/libmpg123/dct64_i386.c src/libmpg123/dct64_i486.c \
-		src/libmpg123/synth_8bit.c src/libmpg123/synth_altivec.c \
-		src/libmpg123/synth.c src/libmpg123/synth_i486.c \
+		src/libmpg123/synth_altivec.c src/libmpg123/synth_i486.c \
+		src/libmpg123/testcpu.c \
   , $(subst $(LOCAL_PATH)/,,\
 	$(wildcard ${LOCAL_PATH}/src/libmpg123/*.c) ))
 
-$(info libmpg123: include dirs $(LOCAL_C_INCLUDES))
-$(info libmpg123: src files $(LOCAL_SRC_FILES))
+# $(info libmpg123: include dirs $(LOCAL_C_INCLUDES))
+# $(info libmpg123: src files $(LOCAL_SRC_FILES))
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/openal-soft-android/Android.mk b/jni/openal-soft-android/Android.mk
index 12e69392..21fe40dd 100644
--- a/jni/openal-soft-android/Android.mk
+++ b/jni/openal-soft-android/Android.mk
@@ -12,11 +12,16 @@ LOCAL_C_INCLUDES  :=  \
 	${LOCAL_PATH}/OpenAL32/Include
 		
 LOCAL_SRC_FILES := \
-	$(filter-out \
-  , $(subst $(LOCAL_PATH)/,,\
-	$(wildcard ${LOCAL_PATH}/OpenAL32/*.c) ))
+	$(filter-out , $(subst $(LOCAL_PATH)/,,\
+	${LOCAL_PATH}/Alc/backends/loopback.c \
+	${LOCAL_PATH}/Alc/backends/null.c \
+	${LOCAL_PATH}/Alc/backends/android.c \
+	${LOCAL_PATH}/Alc/backends/wave.c \
+	$(wildcard ${LOCAL_PATH}/Alc/*.c) \
+	$(wildcard ${LOCAL_PATH}/OpenAL32/*.c) \
+	))
 
-$(info libopenal: include dirs $(LOCAL_C_INCLUDES))
-$(info libopenal: src files $(LOCAL_SRC_FILES))
+# $(info libopenal: include dirs $(LOCAL_C_INCLUDES))
+# $(info libopenal: src files $(LOCAL_SRC_FILES))
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/physfs-2.0.2/Android.mk b/jni/physfs-2.0.2/Android.mk
index 73f2c848..1b0386ec 100644
--- a/jni/physfs-2.0.2/Android.mk
+++ b/jni/physfs-2.0.2/Android.mk
@@ -21,13 +21,16 @@ LOCAL_C_INCLUDES  :=  \
 LOCAL_SRC_FILES := \
 	$(filter-out \
   , $(subst $(LOCAL_PATH)/,,\
+	${LOCAL_PATH}/lzma/C/7zCrc.c \
+	${LOCAL_PATH}/lzma/C/Compress/Lzma/LzmaDecode.c \
 	$(wildcard ${LOCAL_PATH}/*.c) \
-	$(wildcard ${LOCAL_PATH}/lzma/*.c) \
+	$(wildcard ${LOCAL_PATH}/lzma/C/Archive/7z/*.c) \
+	$(wildcard ${LOCAL_PATH}/lzma/C/Compress/Branch/*.c) \
 	$(wildcard ${LOCAL_PATH}/zlib123/*.c) \
 	$(wildcard ${LOCAL_PATH}/archivers/*.c) \
 	$(wildcard ${LOCAL_PATH}/platform/*.c) ))
 
-$(info libphysfs: include dirs $(LOCAL_C_INCLUDES))
-$(info libphysfs: src files $(LOCAL_SRC_FILES))
+# $(info libphysfs: include dirs $(LOCAL_C_INCLUDES))
+# $(info libphysfs: src files $(LOCAL_SRC_FILES))
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/jni/src/Android.mk b/jni/src/Android.mk
index 8053d741..769673b7 100644
--- a/jni/src/Android.mk
+++ b/jni/src/Android.mk
@@ -13,7 +13,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
 	main.cpp
 
 LOCAL_CXXFLAGS := -std=c++0x
-LOCAL_SHARED_LIBRARIES := SDL2 liblua libogg libvorbis libmpg123 libmodplug libopenal libjpeg libtiff libphysfs libmng libfreetype liblcms libpng libjasper libdevil
+LOCAL_SHARED_LIBRARIES := SDL2 liblua 
 LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog 
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/tiff-3.9.5/Android.mk b/jni/tiff-3.9.5/Android.mk
index e90e69b1..8e7ea573 100644
--- a/jni/tiff-3.9.5/Android.mk
+++ b/jni/tiff-3.9.5/Android.mk
@@ -16,9 +16,10 @@ LOCAL_SRC_FILES := \
 	  libtiff/tif_acorn.c libtiff/tif_apple.c libtiff/tif_atari.c \
 		libtiff/tif_msdos.c libtiff/tif_win3.c libtiff/tif_win32.c \
   , $(subst $(LOCAL_PATH)/,,\
+	${LOCAL_PATH}/port/lfind.c \
 	$(wildcard ${LOCAL_PATH}/libtiff/*.c) ))
 
-$(info libtiff: include dirs $(LOCAL_C_INCLUDES))
-$(info libtiff: src files $(LOCAL_SRC_FILES))
+# $(info libtiff: include dirs $(LOCAL_C_INCLUDES))
+# $(info libtiff: src files $(LOCAL_SRC_FILES))
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/org/libsdl/app/SDLActivity.java b/src/org/libsdl/app/SDLActivity.java
index 49b014ce..6f335929 100644
--- a/src/org/libsdl/app/SDLActivity.java
+++ b/src/org/libsdl/app/SDLActivity.java
@@ -46,7 +46,7 @@ public class SDLActivity extends Activity {
         //System.loadLibrary("SDL2_mixer");
         //System.loadLibrary("SDL2_net");
         //System.loadLibrary("SDL2_ttf");
-        System.loadLibrary("main");
+        System.loadLibrary("love");
     }
 
     // Setup