diff -r c0e403f618aa -r 8a2b23efed11 project_files/Android-build/Templates/Makefile.android --- a/project_files/Android-build/Templates/Makefile.android Sun May 20 17:17:21 2012 +0200 +++ b/project_files/Android-build/Templates/Makefile.android Sun May 20 21:09:13 2012 +0200 @@ -1,7 +1,7 @@ SDL_ANDROID_DIR=${CMAKE_CURRENT_SOURCE_DIR}/SDL-android-project PPCROSSARM=${FPC_DIR}/ppcrossarm -PPCROSSARM_FLAGS= -Xd -O2 -g -Tlinux -XParm-linux-androideabi- -B -vwnh +PPCROSSARM_FLAGS= -Xd -O2 -g -Tlinux -XParm-linux-androideabi- -B -vwnh -n PPCROSSARM_INCLUDES= \ -FD${ANDROID_NDK_TOOLCHAINDIR}/bin \ -Fu${FPC_DIR}/../rtl/units/arm-linux \ @@ -22,9 +22,17 @@ $(PPCROSSARM) $(LINKERFLAGS) $(PPCROSSARM_FLAGS) $(PPCROSSARM_INCLUDES) $(FPC_DEFINES) -o${CMAKE_CURRENT_SOURCE_DIR}/out/libhwengine.so ${CMAKE_CURRENT_SOURCE_DIR}/../../hedgewars/hwLibrary.pas ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/out/libhwengine.so $(SDL_ANDROID_DIR)/libs/armeabi/ + +debug: build ${ANT} clean -f $(SDL_ANDROID_DIR)/build.xml ${ANT} debug -f $(SDL_ANDROID_DIR)/build.xml -install: build +unsigned: build + ${ANT} clean -f $(SDL_ANDROID_DIR)/build.xml + ${ANT} release -f $(SDL_ANDROID_DIR)/build.xml + +install/debug: debug + ${ANT} installd -f $(SDL_ANDROID_DIR)/build.xml +install/release: release ${ANT} installd -f $(SDL_ANDROID_DIR)/build.xml clean: