From d7f06d9cde586c717f1eedcd340eba23fafb2c07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julio=20C=C3=A9sar=20Rocha?= <julio@rochsquadron.net>
Date: Mon, 11 Jul 2016 12:53:56 -0700
Subject: [PATCH] Revert "Fix x64 build due to Android project mappings."

This reverts commit b67e2c7f2835ea199c84a5f6896c78b550139f9f.
---
 .gitignore                                     | 2 --
 Source/Android/Bridge/Bridge.vcxproj           | 8 --------
 Source/Android/PluginAudio/PluginAudio.vcxproj | 8 --------
 Source/Android/PluginInput/PluginInput.vcxproj | 8 --------
 Source/Android/PluginRSP/PluginRSP.vcxproj     | 8 --------
 5 files changed, 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index b61f695b9..b168a5b65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,6 @@ Thumbs.db
 /Plugin/RSP/RSP_d 1.7.dll
 /Plugin/RSP/RSP-HLE.dll
 /Plugin/RSP/RSP-HLE_d.dll
-/Plugin64/AndroidAudio
 /Plugin64/Audio/AndroidAudio.dll
 /Plugin64/Audio/AndroidAudio_d.dll
 /Plugin64/GFX/lib
@@ -72,7 +71,6 @@ Thumbs.db
 /Plugin64/RSP/pdb
 /Plugin64/RSP/RSP 1.7.dll
 /Plugin64/RSP/RSP_d 1.7.dll
-/Plugin64/RSP/RSP-HLE.dll
 /Source/3rdParty/wx/lib/vc_lib/msw/wx/setup.h
 /Source/3rdParty/wx/lib/vc_lib/mswd/wx/setup.h
 /Source/3rdParty/wx/lib/vc_lib/mswu/wx/msw/rcdefs.h
diff --git a/Source/Android/Bridge/Bridge.vcxproj b/Source/Android/Bridge/Bridge.vcxproj
index 99a545a27..f6dff789f 100644
--- a/Source/Android/Bridge/Bridge.vcxproj
+++ b/Source/Android/Bridge/Bridge.vcxproj
@@ -5,18 +5,10 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{593B00E6-1987-415D-A62C-26533FC3E95C}</ProjectGuid>
diff --git a/Source/Android/PluginAudio/PluginAudio.vcxproj b/Source/Android/PluginAudio/PluginAudio.vcxproj
index 6ebc78989..aed6a6428 100644
--- a/Source/Android/PluginAudio/PluginAudio.vcxproj
+++ b/Source/Android/PluginAudio/PluginAudio.vcxproj
@@ -5,18 +5,10 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{D233025A-231F-4A43-92B6-E87193C60ACC}</ProjectGuid>
diff --git a/Source/Android/PluginInput/PluginInput.vcxproj b/Source/Android/PluginInput/PluginInput.vcxproj
index fd8bc713b..907bf77d0 100644
--- a/Source/Android/PluginInput/PluginInput.vcxproj
+++ b/Source/Android/PluginInput/PluginInput.vcxproj
@@ -5,18 +5,10 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1133A1CC-A9E5-4026-B20D-6A2987130D4E}</ProjectGuid>
diff --git a/Source/Android/PluginRSP/PluginRSP.vcxproj b/Source/Android/PluginRSP/PluginRSP.vcxproj
index 693c0ef15..81f9dc27c 100644
--- a/Source/Android/PluginRSP/PluginRSP.vcxproj
+++ b/Source/Android/PluginRSP/PluginRSP.vcxproj
@@ -5,18 +5,10 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B685BB34-D700-4FCC-8503-9B6AA1A0C95D}</ProjectGuid>