fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

Android isn't really failing. Lets fix up the makefile.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4089 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-07-21 07:36:26 +00:00
parent 8a7d87fa8e
commit 65fb47c9f6
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engine/Makefile
View file

@ -57,6 +57,7 @@ DROID_NDK_PATH?=~/droid/android-ndk-r6b
DROID_SDK_PATH?=~/droid/android-sdk-linux_x86 DROID_SDK_PATH?=~/droid/android-sdk-linux_x86
ANT?=ant ANT?=ant
JAVATOOL="$(JAVA_HOME)"/bin/ JAVATOOL="$(JAVA_HOME)"/bin/
ANDROID_SCRIPT=android
ifeq ($(WHOAMI),moodles) ifeq ($(WHOAMI),moodles)
ANT_HOME=/home/moodles/apache-ant-1.8.2/ ANT_HOME=/home/moodles/apache-ant-1.8.2/
@ -86,6 +87,7 @@ ifeq ($(FTE_TARGET),droid)
else else
TOOLCHAIN:=$(NDK_PATH)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/windows/bin/arm-linux-androideabi- TOOLCHAIN:=$(NDK_PATH)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/windows/bin/arm-linux-androideabi-
endif endif
ANDROID_SCRIPT=android.bat
#make can't cope with absolute paths in dependancy files #make can't cope with absolute paths in dependancy files
NODEPS = 1 NODEPS = 1
endif endif
@ -1314,8 +1316,7 @@ distclean: clean
#makes an ant project for us #makes an ant project for us
droid/build.xml: droid/build.xml:
-cd droid && PATH=$$PATH:$(DROID_SDK_PATH)/tools:$(DROID_NDK_PATH) android update project -t android-8 -p . -n FTEDroid -cd droid && PATH=$$PATH:$(DROID_SDK_PATH)/tools:$(DROID_NDK_PATH) $(ANDROID_SCRIPT) update project -t android-8 -p . -n FTEDroid
-cd droid && PATH=$$PATH:$(DROID_SDK_PATH)/tools:$(DROID_NDK_PATH) android.bat update project -t android-8 -p . -n FTEDroid
#build FTE as a library, then build the java+package (release) #build FTE as a library, then build the java+package (release)
droid/ftekeystore: droid/ftekeystore: