ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix automated NDK build on windows, Add x86 to touchpad

This commit is contained in:
TwistedUmbrella 2014-03-03 17:30:19 -05:00
parent b14440970b
commit deba6cbcd1
3 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
shell/android/build.xml
View File

@ -70,22 +70,6 @@
-pre-clean
-->
<import file="custom_rules.xml" optional="true" />
<property name="ndkbuildopt" value=""/>
<target name="-pre-build">
<exec executable="${ndk.dir}/ndk-build" failonerror="true">
<arg line="-j4 ${ndkbuildopt}"/>
</exec>
<copy todir="${jar.libs.dir}/armeabi-v7a">
<fileset
dir="xperia/libs/armeabi-v7a"
includes="libsexplay.so" />
</copy>
</target>
<target name="clean" depends="android_rules.clean">
<exec executable="${ndk.dir}/ndk-build" failonerror="true">
<arg value="clean"/>
</exec>
</target>
<!-- Import the actual build file.

27
shell/android/custom_rules.xml Normal file
View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="reicast-touchpad" default="help">
<property name="ndkbuildopt" value=""/>
<target name="-pre-build">
<exec executable="${ndk.dir}/ndk-build.cmd" failonerror="true" osfamily="windows">
<arg line="-j8 ${ndkbuildopt}"/>
</exec>
<exec executable="${ndk.dir}/ndk-build" failonerror="true" osfamily="unix">
<arg line="-j8 ${ndkbuildopt}"/>
</exec>
<copy todir="${jar.libs.dir}/armeabi-v7a">
<fileset
dir="xperia/libs/armeabi-v7a"
includes="libsexplay.so" />
</copy>
<copy todir="${jar.libs.dir}/x86">
<fileset
dir="xperia/libs/x86"
includes="libsexplay.so" />
</copy>
</target>
<target name="clean" depends="android_rules.clean">
<exec executable="${ndk.dir}/ndk-build" failonerror="true">
<arg value="clean"/>
</exec>
</target>
</project>

4
shell/android/xperia/jni/Application.mk
View File

@ -1,4 +1,4 @@
#APP_ABI := armeabi-v7a x86
APP_ABI := armeabi-v7a
APP_ABI := armeabi-v7a x86
#APP_ABI := armeabi-v7a
APP_PLATFORM := android-9
NDK_TOOLCHAIN_VERSION := 4.8