Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
split the installing and building in the android Makefile
authorXeli
Sat, 11 Feb 2012 14:30:15 +0100
changeset 6668 f2091a9a77fa
parent 6667 142fe596e75e
child 6669 3933198e2b28
split the installing and building in the android Makefile
project_files/Android-build/Templates/Makefile.android file | annotate | diff | comparison | revisions 
--- 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
hedgewars