diff options
| author | NeoBrainX <NeoBrainX@gmail.com> | 2013-04-25 14:01:07 +0200 |
|---|---|---|
| committer | NeoBrainX <NeoBrainX@gmail.com> | 2013-04-25 14:05:54 +0200 |
| commit | 5e6b712651dc042b06ce59bcfb4becda5ee15022 (patch) | |
| tree | c82731464d76517cce5ffb6d7e9764c47a433804 /Source/Android/custom_rules.xml | |
| parent | eef95fa4c5919bf93335e10dd61cd5a9fd6a5f6d (diff) | |
| parent | d18b71ccf91c9578236b44ae26e8bc35314cc180 (diff) | |
Merge 'master' into shader-uids-awesome.
Conflicts:
Source/Core/VideoCommon/Src/BPMemory.h
Source/Core/VideoCommon/Src/LightingShaderGen.cpp
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Core/VideoCommon/Src/PixelShaderGen.h
Source/Core/VideoCommon/Src/PixelShaderManager.cpp
Source/Core/VideoCommon/Src/VertexShaderGen.cpp
Source/Core/VideoCommon/Src/VertexShaderGen.h
Diffstat (limited to 'Source/Android/custom_rules.xml')
| -rw-r--r-- | Source/Android/custom_rules.xml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Source/Android/custom_rules.xml b/Source/Android/custom_rules.xml new file mode 100644 index 0000000000..e06de68e57 --- /dev/null +++ b/Source/Android/custom_rules.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="Dolphin" default="help"> + <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="../../libs/armeabi-v7a" + includes="libdolphin-emu-nogui.so" /> + </copy> + </target> + <target name="clean" depends="android_rules.clean"> + <exec executable="${ndk.dir}/ndk-build" failonerror="true"> + <arg value="clean"/> + </exec> + </target> +</project> |