--- a/project_files/Android-build/CMakeLists.txt	Sun Jan 22 23:36:36 2012 +0100
+++ b/project_files/Android-build/CMakeLists.txt	Tue Jan 24 01:03:33 2012 +0100
@@ -72,37 +72,11 @@
                 ) 
 endif(ANDROID)
 
-if(SDL_DIR_TEMP_DISABLE)
-    MESSAGE("Moving Android port of SDL to the proper directories")
-    set(DirsToCopy
-        SDL
-        SDL_image
-        SDL_mixer
-        SDL_ttf
-	jpeg
-	png
-         mikmod
-        ) 
-    foreach(DIR ${DirsToCopy})
-        exec_program( 
-            ${CMAKE_COMMAND} 
-            ARGS -E copy_directory 
-            ${SDL_DIR}/jni/${DIR}
-            ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/${DIR}
-        )
-        MESSAGE(STATUS "Moved ${DIR}")
-    endforeach(DIR)
+exec_program(${HGCOMMAND}
+    ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL/src/core/android/SDL_android.cpp
+    OUTPUT_VARIABLE dontcare
+)
     exec_program(${HGCOMMAND}
-        ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL/src/core/android/SDL_android.cpp
-	)
-    exec_program(${HGCOMMAND}
-        ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL/src/main/android/SDL_android_main.cpp
-	)
-    exec_program(${HGCOMMAND}
-        ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL/src/video/android/SDL_androidtouch.c
-        )
-
-    exec_program(${HGCOMMAND}
-        ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL/src/video/android/SDL_androidtouch.h
-	)
-endif(SDL_DIR_TEMP_DISABLE)
+    ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL/src/main/android/SDL_android_main.cpp
+    OUTPUT_VARIABLE dontcare
+)

--- a/project_files/Android-build/SDL-android-project/jni/SDL_mixer/Android.mk	Sun Jan 22 23:36:36 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := SDL_mixer
-
-LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/../../../../../misc/libtremor \
-        $(LOCAL_PATH)/.. \
-	$(LOCAL_PATH)/../SDL/include \
-	$(LOCAL_PATH)/../mikmod/include \
-
-LOCAL_CFLAGS := -DWAV_MUSIC -DOGG_MUSIC -DOGG_USE_TREMOR -DMOD_MUSIC
-
-LOCAL_SRC_FILES := $(notdir $(filter-out %/playmus.c %/playwave.c %/fluidsynth.c, $(wildcard $(LOCAL_PATH)/*.c)))
-
-LOCAL_SHARED_LIBRARIES := SDL mikmod
-LOCAL_STATIC_LIBRARIES := tremor
-
-include $(BUILD_SHARED_LIBRARY)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/project_files/Android-build/download_libs.sh	Tue Jan 24 01:03:33 2012 +0100
@@ -0,0 +1,18 @@
+#!/bin/sh
+download_and_zip (){
+    echo "Downloading: $1"
+    curl -silent -o tmp.zip $1 #grab the zips from an url
+    unzip -qq tmp.zip  -d SDL-android-project/jni/tmp #unzip it to a tmp file
+    rm -fr SDL-android-project/jni/$2 #remove any old dirs, we will get those files back with hg revert in CMakeList
+    mv SDL-android-project/jni/tmp/* SDL-android-project/jni/$2 #move the tmp dir to the jni directory
+    rm tmp.zip #remove old tmp dir
+}
+download_and_zip http://www.libsdl.org/projects/SDL_image/libs/jpegsr8d.zip jpeg
+download_and_zip http://www.libsdl.org/projects/SDL_image/libs/lpng157.zip png
+download_and_zip http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.zip SDL_image
+download_and_zip http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.zip SDL_mixer
+download_and_zip http://www.xelification.com/tmp/mikmod.zip mikmod #temporary url since the libsdl.org site doesn't work at the moment
+download_and_zip http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.zip SDL_net
+download_and_zip http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.zip SDL_ttf
+download_and_zip http://www.libsdl.org/tmp/SDL-1.3.zip SDL
+