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.
Have make move the actual libhwengine.so to the SDL-android-project folder, rather than having the ndk-build reference to it. This removes the circular dependency hedgeroid
authorXeli
Thu, 23 Jun 2011 14:12:11 +0200
branchhedgeroid
changeset 5314 09bcdcd78379
parent 5311 a0b808b2df2b
child 5317 86984c1034a5
Have make move the actual libhwengine.so to the SDL-android-project folder, rather than having the ndk-build reference to it. This removes the circular dependency
project_files/Android-build/Makefile.android file | annotate | diff | comparison | revisions
project_files/Android-build/SDL-android-project/jni/src/Android.mk file | annotate | diff | comparison | revisions 
--- a/project_files/Android-build/Makefile.android	Thu Jun 23 13:57:16 2011 +0200
+++ b/project_files/Android-build/Makefile.android	Thu Jun 23 14:12:11 2011 +0200
@@ -8,7 +8,7 @@
 ANDROID_API_LVL=5
 
 PPCROSSARM=$(FPC_DIR)/compiler/ppcrossarm
-PPCROSSARM_FLAGS= -Xd -O- -Tlinux -XParm-linux-androideabi- -vwnh -XS  
+PPCROSSARM_FLAGS= -Xd -O- -Tlinux -XParm-linux-androideabi- -vwnh -XS -a- 
 PPCROSSARM_INCLUDES= \
 	-FD$(ANDROID_NDK)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin \
 	-Fu$(FPC_DIR)/rtl/units/arm-linux \
@@ -22,6 +22,6 @@
 all:
 	-mkdir out
 	$(PPCROSSARM) $(LINKERFLAGS) $(PPCROSSARM_FLAGS) $(PPCROSSARM_INCLUDES) $(FPC_DEFINES) -oout/libhwengine.so ../../hedgewars/hwLibrary.pas
-
+	cp out/libhwengine.so SDL-android-project/libs/armeabi
 clean:  
 	rm out/*
--- a/project_files/Android-build/SDL-android-project/jni/src/Android.mk	Thu Jun 23 13:57:16 2011 +0200
+++ b/project_files/Android-build/SDL-android-project/jni/src/Android.mk	Thu Jun 23 14:12:11 2011 +0200
@@ -15,7 +15,3 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := hwengine
-LOCAL_SRC_FILES := $(LOCAL_DIR)../../../out/libhwengine.so
-include $(PREBUILT_SHARED_LIBRARY)
hedgewars