patching files is so SDL1.3, we're SDL2 nowadays
authorkoda
Thu, 25 Jul 2013 23:52:07 +0200
changeset 9374 60063430445b
parent 9373 b769a8e38cbd
child 9375 1928c9ef84f8
patching files is so SDL1.3, we're SDL2 nowadays
project_files/Android-build/CMakeLists.txt
--- a/project_files/Android-build/CMakeLists.txt	Thu Jul 25 23:29:37 2013 +0200
+++ b/project_files/Android-build/CMakeLists.txt	Thu Jul 25 23:52:07 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
+#)