Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-03-01 10:35:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #8047 from hrydgard/revert-7897-win10update

Browse Source 
Revert "Make PPSSPP aware of Windows 10 (mostly for the info screen)."
This commit is contained in:
Henrik Rydgård 2015-10-10 19:35:55 +02:00
commit 06cbc31a82
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Windows/PPSSPP.manifest
View File

@ -19,21 +19,6 @@
processorArchitecture="*"/>
</dependentAssembly>
</dependency>
<!-- Windows doesn't need to use the lie shim with PPSSPP. -->
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- Windows Vista -->
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
<!-- Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<!-- Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application>
</compatibility>
<!-- Identify the application security requirements. -->
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>

4
Windows/main.cpp
View File

@ -113,7 +113,6 @@ std::string GetWindowsVersion() {
const bool IsWindows7SP1 = DoesVersionMatchWindows(6, 1, 1, 0);
const bool IsWindows8 = DoesVersionMatchWindows(6, 2);
const bool IsWindows8_1 = DoesVersionMatchWindows(6, 3);
const bool IsWindows10 = DoesVersionMatchWindows(10, 0);
if (IsWindowsXPSP2)
return "Microsoft Windows XP, Service Pack 2";
@ -142,9 +141,6 @@ std::string GetWindowsVersion() {
if (IsWindows8_1)
return "Microsoft Windows 8.1";
if (IsWindows10)
return "Microsoft Windows 10";
return "Unsupported version of Microsoft Windows.";
}