project_files/Android-build/CMakeLists.txt
branchspacecampaign
changeset 9382 f1464fa10c0b
parent 9374 60063430445b
child 9521 8054d9d775fd
child 9963 9e75dbffec81
equal deleted inserted replaced
9346:1245c7636380 9382:f1464fa10c0b
    92     message(STATUS "Updating android project config...\n" ${androidoutput})
    92     message(STATUS "Updating android project config...\n" ${androidoutput})
    93 else()
    93 else()
    94     message(FATAL_ERROR "Couldn't find the android executable in ${ANDROID_SDK}/platform-tools or ${ANDROID_SDK}/tools.")
    94     message(FATAL_ERROR "Couldn't find the android executable in ${ANDROID_SDK}/platform-tools or ${ANDROID_SDK}/tools.")
    95 endif()
    95 endif()
    96 
    96 
    97 exec_program(${HGCOMMAND}
    97 ##
    98     ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL/src/core/android/SDL_android.cpp
    98 # FIXME: this was useful for early version of SDL 1.3 so is most likely not needed anymore
    99     OUTPUT_VARIABLE dontcare
    99 #        if so delete the files referenced here from the repository
   100 )
   100 #        commenting out because it inteferes with SDL 2 builds
   101 exec_program(${HGCOMMAND}
   101 ##
   102     ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL/src/main/android/SDL_android_main.cpp
   102 #exec_program(${HGCOMMAND}
   103     OUTPUT_VARIABLE dontcare
   103 #    ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL/src/core/android/SDL_android.cpp
   104 )
   104 #    OUTPUT_VARIABLE dontcare
   105 exec_program(${HGCOMMAND}
   105 #)
   106     ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL/src/file/SDL_rwops.c
   106 #exec_program(${HGCOMMAND}
   107     OUTPUT_VARIABLE dontcare
   107 #    ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL/src/main/android/SDL_android_main.cpp
   108 )
   108 #    OUTPUT_VARIABLE dontcare
   109 exec_program(${HGCOMMAND}
   109 #)
   110     ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL_mixer/Android.mk
   110 #exec_program(${HGCOMMAND}
   111     OUTPUT_VARIABLE dontcare
   111 #    ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL/src/file/SDL_rwops.c
   112 )
   112 #    OUTPUT_VARIABLE dontcare
   113 exec_program(${HGCOMMAND}
   113 #)
   114     ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL_ttf/Android.mk
   114 #exec_program(${HGCOMMAND}
   115     OUTPUT_VARIABLE dontcare
   115 #    ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL_mixer/Android.mk
   116 )
   116 #    OUTPUT_VARIABLE dontcare
       
   117 #)
       
   118 #exec_program(${HGCOMMAND}
       
   119 #    ARGS revert ${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project/jni/SDL_ttf/Android.mk
       
   120 #    OUTPUT_VARIABLE dontcare
       
   121 #)
   117 
   122