project_files/Android-build/CMakeLists.txt
changeset 6590 5f15b4026b19
parent 6589 2fa0a274a1e3
child 6591 2abf9ea19a38
--- 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
+)