# HG changeset patch # User Xeli # Date 1328967015 -3600 # Node ID f2091a9a77fa710898d10b0bd3f5986454ba193d # Parent 142fe596e75efc046a5af01e0aa9e0f283568454 split the installing and building in the android Makefile diff -r 142fe596e75e -r f2091a9a77fa project_files/Android-build/Templates/Makefile.android --- a/project_files/Android-build/Templates/Makefile.android Sat Feb 11 05:48:33 2012 +0100 +++ b/project_files/Android-build/Templates/Makefile.android Sat Feb 11 14:30:15 2012 +0100 @@ -11,17 +11,19 @@ #LINKERFLAGS= -k"--static" FPC_DEFINES=-dandroid -darm - -all: +all: install +build: -${CMAKE_COMMAND} -E make_directory out ${ANDROID_NDK}/ndk-build -C $(SDL_ANDROID_DIR) -j 8 $(PPCROSSARM) $(LINKERFLAGS) $(PPCROSSARM_FLAGS) $(PPCROSSARM_INCLUDES) $(FPC_DEFINES) -oout/libhwengine.so ../../hedgewars/hwLibrary.pas ${CMAKE_COMMAND} -E copy out/libhwengine.so SDL-android-project/libs/armeabi/ - ${ANT} clean -f $(SDL_ANDROID_DIR)/build.xml - ${ANT} debug install -f $(SDL_ANDROID_DIR)/build.xml + ${ANT} debug -f $(SDL_ANDROID_DIR)/build.xml +install: build + ${ANT} installd -f $(SDL_ANDROID_DIR)/build.xml + clean: ${CMAKE_COMMAND} -E remove_directory out ${ANDROID_NDK}/ndk-build -C $(SDL_ANDROID_DIR) -j 8 clean