From f7c715200fb24849e37cc995a3e84cec889c9719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20C=C3=A9sar=20Rocha?= Date: Mon, 11 Jul 2016 13:19:31 -0700 Subject: [PATCH] Removed Android plugins from x64 build. --- .gitignore | 3 +++ Project64.sln | 18 +----------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index b168a5b65..ec7ebb81a 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,7 @@ 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 @@ -71,6 +72,8 @@ Thumbs.db /Plugin64/RSP/pdb /Plugin64/RSP/RSP 1.7.dll /Plugin64/RSP/RSP_d 1.7.dll +/Plugin64/RSP/RSP-HLE.dll +/Plugin64/RSP/RSP-HLE_d.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/Project64.sln b/Project64.sln index 8e4fb5a18..51f237409 100644 --- a/Project64.sln +++ b/Project64.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2010 or lager +# Visual Studio 2010 or later MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}" EndProject @@ -181,36 +181,20 @@ Global {17836496-31B0-46F2-B1B1-366D7DF6F04C}.Release|x64.Build.0 = Release|x64 {D233025A-231F-4A43-92B6-E87193C60ACC}.Debug|Win32.ActiveCfg = Debug|Win32 {D233025A-231F-4A43-92B6-E87193C60ACC}.Debug|Win32.Build.0 = Debug|Win32 - {D233025A-231F-4A43-92B6-E87193C60ACC}.Debug|x64.ActiveCfg = Debug|x64 - {D233025A-231F-4A43-92B6-E87193C60ACC}.Debug|x64.Build.0 = Debug|x64 {D233025A-231F-4A43-92B6-E87193C60ACC}.Release|Win32.ActiveCfg = Release|Win32 {D233025A-231F-4A43-92B6-E87193C60ACC}.Release|Win32.Build.0 = Release|Win32 - {D233025A-231F-4A43-92B6-E87193C60ACC}.Release|x64.ActiveCfg = Release|x64 - {D233025A-231F-4A43-92B6-E87193C60ACC}.Release|x64.Build.0 = Release|x64 {1133A1CC-A9E5-4026-B20D-6A2987130D4E}.Debug|Win32.ActiveCfg = Debug|Win32 {1133A1CC-A9E5-4026-B20D-6A2987130D4E}.Debug|Win32.Build.0 = Debug|Win32 - {1133A1CC-A9E5-4026-B20D-6A2987130D4E}.Debug|x64.ActiveCfg = Debug|x64 - {1133A1CC-A9E5-4026-B20D-6A2987130D4E}.Debug|x64.Build.0 = Debug|x64 {1133A1CC-A9E5-4026-B20D-6A2987130D4E}.Release|Win32.ActiveCfg = Release|Win32 {1133A1CC-A9E5-4026-B20D-6A2987130D4E}.Release|Win32.Build.0 = Release|Win32 - {1133A1CC-A9E5-4026-B20D-6A2987130D4E}.Release|x64.ActiveCfg = Release|x64 - {1133A1CC-A9E5-4026-B20D-6A2987130D4E}.Release|x64.Build.0 = Release|x64 {B685BB34-D700-4FCC-8503-9B6AA1A0C95D}.Debug|Win32.ActiveCfg = Debug|Win32 {B685BB34-D700-4FCC-8503-9B6AA1A0C95D}.Debug|Win32.Build.0 = Debug|Win32 - {B685BB34-D700-4FCC-8503-9B6AA1A0C95D}.Debug|x64.ActiveCfg = Debug|x64 - {B685BB34-D700-4FCC-8503-9B6AA1A0C95D}.Debug|x64.Build.0 = Debug|x64 {B685BB34-D700-4FCC-8503-9B6AA1A0C95D}.Release|Win32.ActiveCfg = Release|Win32 {B685BB34-D700-4FCC-8503-9B6AA1A0C95D}.Release|Win32.Build.0 = Release|Win32 - {B685BB34-D700-4FCC-8503-9B6AA1A0C95D}.Release|x64.ActiveCfg = Release|x64 - {B685BB34-D700-4FCC-8503-9B6AA1A0C95D}.Release|x64.Build.0 = Release|x64 {593B00E6-1987-415D-A62C-26533FC3E95C}.Debug|Win32.ActiveCfg = Debug|Win32 {593B00E6-1987-415D-A62C-26533FC3E95C}.Debug|Win32.Build.0 = Debug|Win32 - {593B00E6-1987-415D-A62C-26533FC3E95C}.Debug|x64.ActiveCfg = Debug|x64 - {593B00E6-1987-415D-A62C-26533FC3E95C}.Debug|x64.Build.0 = Debug|x64 {593B00E6-1987-415D-A62C-26533FC3E95C}.Release|Win32.ActiveCfg = Release|Win32 {593B00E6-1987-415D-A62C-26533FC3E95C}.Release|Win32.Build.0 = Release|Win32 - {593B00E6-1987-415D-A62C-26533FC3E95C}.Release|x64.ActiveCfg = Release|x64 - {593B00E6-1987-415D-A62C-26533FC3E95C}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE