From 347a3aa833ab1b521b1f5b0597120dd23ef1cd2f Mon Sep 17 00:00:00 2001 From: zeromus Date: Tue, 31 Mar 2020 00:16:57 -0400 Subject: [PATCH] remove x86 from windows port since there are now known code generation bugs in the wifi which definitely pose user-facing problems --- desmume/src/frontend/windows/DeSmuME.sln | 71 +++++++-------- desmume/src/frontend/windows/DeSmuME.vcxproj | 88 ------------------- desmume/src/frontend/windows/DeSmuME_2010.bat | 1 - .../frontend/windows/DeSmuME_Win32.manifest | 23 ----- 4 files changed, 31 insertions(+), 152 deletions(-) delete mode 100644 desmume/src/frontend/windows/DeSmuME_2010.bat delete mode 100644 desmume/src/frontend/windows/DeSmuME_Win32.manifest diff --git a/desmume/src/frontend/windows/DeSmuME.sln b/desmume/src/frontend/windows/DeSmuME.sln index 4a4bc4704..5fd03f069 100644 --- a/desmume/src/frontend/windows/DeSmuME.sln +++ b/desmume/src/frontend/windows/DeSmuME.sln @@ -1,40 +1,31 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DeSmuME", "DeSmuME.vcxproj", "{9F5F72A1-D3A5-4918-B460-E076B16D10A9}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Dev+|x64 = Dev+|x64 - Dev+|x86 = Dev+|x86 - Release Fastbuild|x64 = Release Fastbuild|x64 - Release Fastbuild|x86 = Release Fastbuild|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|x64.ActiveCfg = Debug|x64 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|x64.Build.0 = Debug|x64 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|x86.ActiveCfg = Debug|Win32 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|x86.Build.0 = Debug|Win32 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Dev+|x64.ActiveCfg = Dev+|x64 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Dev+|x64.Build.0 = Dev+|x64 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Dev+|x86.ActiveCfg = Dev+|Win32 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Dev+|x86.Build.0 = Dev+|Win32 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release Fastbuild|x64.ActiveCfg = Release Fastbuild|x64 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release Fastbuild|x64.Build.0 = Release Fastbuild|x64 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release Fastbuild|x86.ActiveCfg = Release Fastbuild|Win32 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release Fastbuild|x86.Build.0 = Release Fastbuild|Win32 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|x64.ActiveCfg = Release|x64 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|x64.Build.0 = Release|x64 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|x86.ActiveCfg = Release|Win32 - {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29920.165 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DeSmuME", "DeSmuME.vcxproj", "{9F5F72A1-D3A5-4918-B460-E076B16D10A9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Dev+|x64 = Dev+|x64 + Release Fastbuild|x64 = Release Fastbuild|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|x64.ActiveCfg = Debug|x64 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Debug|x64.Build.0 = Debug|x64 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Dev+|x64.ActiveCfg = Dev+|x64 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Dev+|x64.Build.0 = Dev+|x64 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release Fastbuild|x64.ActiveCfg = Release Fastbuild|x64 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release Fastbuild|x64.Build.0 = Release Fastbuild|x64 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|x64.ActiveCfg = Release|x64 + {9F5F72A1-D3A5-4918-B460-E076B16D10A9}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F45EAF90-6F8F-4EB8-BA07-34F20AE3DD45} + EndGlobalSection +EndGlobal diff --git a/desmume/src/frontend/windows/DeSmuME.vcxproj b/desmume/src/frontend/windows/DeSmuME.vcxproj index fc22e4fec..f6aadc49c 100644 --- a/desmume/src/frontend/windows/DeSmuME.vcxproj +++ b/desmume/src/frontend/windows/DeSmuME.vcxproj @@ -1,34 +1,18 @@  - - Debug - Win32 - Debug x64 - - Dev+ - Win32 - Dev+ x64 - - Release Fastbuild - Win32 - Release Fastbuild x64 - - Release - Win32 - Release x64 @@ -67,26 +51,6 @@ - - - true - - - - - true - - - - - true - - - - - true - - @@ -206,30 +170,18 @@ - true - true - true - true true true true true - true - true - true - true true true true true - true - true - true - true true true true @@ -427,30 +379,18 @@ - true - true - true - true true true true true - true - true - true - true true true true true - true - true - true - true true true true @@ -716,26 +656,10 @@ - call un7z_and_touch.bat directx\directx.7z .libs\directx* - - 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) - .libs\directx.tag;%(Outputs) call un7z_and_touch.bat directx\directx.7z .libs\directx* 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) .libs\directx.tag;%(Outputs) - call un7z_and_touch.bat directx\directx.7z .libs\directx* - - 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) - .libs\directx.tag;%(Outputs) - call un7z_and_touch.bat directx\directx.7z .libs\directx* - - call un7z_and_touch.bat directx\directx.7z .libs\directx* - - 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) - 7z.exe;un7z_and_touch.bat;%(AdditionalInputs) - .libs\directx.tag;%(Outputs) - .libs\directx.tag;%(Outputs) call un7z_and_touch.bat directx\directx.7z .libs\directx* call un7z_and_touch.bat directx\directx.7z .libs\directx* @@ -746,21 +670,9 @@ .libs\directx.tag;%(Outputs) - call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag - 7z.exe;un7z_and_touch.bat - .libs\lua.tag; call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag 7z.exe;un7z_and_touch.bat .libs\lua.tag; - call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag - 7z.exe;un7z_and_touch.bat - .libs\lua.tag; - call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag - call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag - 7z.exe;un7z_and_touch.bat - 7z.exe;un7z_and_touch.bat - .libs\lua.tag; - .libs\lua.tag; call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag call un7z_and_touch.bat lua\lua.7z .libs\win32\lua* .libs\x64\lua* .libs\lua.tag 7z.exe;un7z_and_touch.bat diff --git a/desmume/src/frontend/windows/DeSmuME_2010.bat b/desmume/src/frontend/windows/DeSmuME_2010.bat deleted file mode 100644 index a1336451b..000000000 --- a/desmume/src/frontend/windows/DeSmuME_2010.bat +++ /dev/null @@ -1 +0,0 @@ -start "" "%VS100COMNTOOLS%\..\IDE\devenv.exe" DeSmuME.sln \ No newline at end of file diff --git a/desmume/src/frontend/windows/DeSmuME_Win32.manifest b/desmume/src/frontend/windows/DeSmuME_Win32.manifest deleted file mode 100644 index 4e25cd13f..000000000 --- a/desmume/src/frontend/windows/DeSmuME_Win32.manifest +++ /dev/null @@ -1,23 +0,0 @@ - - - -DeSmuME - - - - - -