Merge pull request #1061 from CyberShadow/pull-20140928-032517

Android build fix for Windows

.gitignore

@@ -27,9 +27,6 @@ ipch
 *.zip
 RetroArch-w32/
 RetroArch-w64/
-android/native/obj/
-android/phoenix/bin/
-android/phoenix/gen/
 .DS_Store
 */build/*
 *.pbxuser
@@ -63,3 +60,18 @@ apple/RetroArch_iOS.xcodeproj/project.xcworkspace/*
 /python/
 /rsound.h
 .pc
+/media/shaders_glsl/
+
+# Android
+/android/phoenix/obj/
+/android/phoenix/assets/
+/android/phoenix/libs/
+/android/phoenix/bin/
+/android/phoenix/gen/
+/android/phoenix/local.properties
+
+# Cloned by libretro-fetch.sh
+/media/assets/
+/media/autoconfig/
+/media/overlays/
+/media/shaders/

android/phoenix/build.xml

@@ -58,6 +58,11 @@
             unless="sdk.dir"
     />
 
+    <!-- Name of ndk-build executable. -->
+    <condition property="ndk.cmd" value="ndk-build.cmd" else="ndk-build">
+        <os family="windows"/>
+    </condition>
+
     <!--
         Import per project custom build rules if present at the root of the project.
         This is the place to put custom intermediary targets such as:
@@ -72,13 +77,13 @@
     -->
     <import file="custom_rules.xml" optional="true" />
     <target name="-pre-build">
-       <exec executable="${ndk.dir}/ndk-build" failonerror="true">
+       <exec executable="${ndk.dir}/${ndk.cmd}" failonerror="true">
           <arg value="-j4"/>
        </exec>
     </target>
 
     <target name="clean" depends="android_rules.clean">
-       <exec executable="${ndk.dir}/ndk-build" failonerror="true">
+       <exec executable="${ndk.dir}/${ndk.cmd}" failonerror="true">
           <arg value="clean"/>
        </exec>
     </target>