project_files/Android-build/CMakeLists.txt
branchwebgl
changeset 9521 8054d9d775fd
parent 8330 aaefa587e277
parent 9374 60063430445b
child 10015 4feced261c68
--- a/project_files/Android-build/CMakeLists.txt	Fri Oct 11 11:55:31 2013 +0200
+++ b/project_files/Android-build/CMakeLists.txt	Fri Oct 11 17:43:13 2013 +0200
@@ -94,24 +94,29 @@
     message(FATAL_ERROR "Couldn't find the android executable in ${ANDROID_SDK}/platform-tools or ${ANDROID_SDK}/tools.")
 endif()
 
-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/main/android/SDL_android_main.cpp
-    OUTPUT_VARIABLE dontcare
-)
-exec_program(${HGCOMMAND}
-    ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL/src/file/SDL_rwops.c
-    OUTPUT_VARIABLE dontcare
-)
-exec_program(${HGCOMMAND}
-    ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL_mixer/Android.mk
-    OUTPUT_VARIABLE dontcare
-)
-exec_program(${HGCOMMAND}
-    ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL_ttf/Android.mk
-    OUTPUT_VARIABLE dontcare
-)
+##
+# FIXME: this was useful for early version of SDL 1.3 so is most likely not needed anymore
+#        if so delete the files referenced here from the repository
+#        commenting out because it inteferes with SDL 2 builds
+##
+#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/main/android/SDL_android_main.cpp
+#    OUTPUT_VARIABLE dontcare
+#)
+#exec_program(${HGCOMMAND}
+#    ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL/src/file/SDL_rwops.c
+#    OUTPUT_VARIABLE dontcare
+#)
+#exec_program(${HGCOMMAND}
+#    ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL_mixer/Android.mk
+#    OUTPUT_VARIABLE dontcare
+#)
+#exec_program(${HGCOMMAND}
+#    ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL_ttf/Android.mk
+#    OUTPUT_VARIABLE dontcare
+#)