Mercurial Mercurial > hedgewars / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
project_files/Android-build/Templates/Makefile.android
branchhedgeroid
changeset 6230 de1e43054017
parent 6033 6bcc36225162
child 6589 2fa0a274a1e3 
--- a/project_files/Android-build/Templates/Makefile.android	Sat Nov 12 14:45:36 2011 +0100
+++ b/project_files/Android-build/Templates/Makefile.android	Sat Nov 12 14:48:35 2011 +0100
@@ -14,7 +14,14 @@
 
 all:
 	-${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} install -f $(SDL_ANDROID_DIR)/build.xml
 clean:  
-	${CMAKE_COMMAND} -E remove_directory out	
+	${CMAKE_COMMAND} -E remove_directory out
+	${ANDROID_NDK}/ndk-build -C $(SDL_ANDROID_DIR) -j 8 clean
+	${ANT} clean -f $(SDL_ANDROID_DIR)/build.xml
hedgewars