zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 22:11:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add Windows 8+ related bits to the manifest

Browse source
This commit is contained in:
Randy Heit 2015-03-27 00:25:53 -05:00
parent 3463b87876
commit 5d27bf7742
3 changed files with 45 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/win32/i_system.cpp
View file

@ -561,37 +561,26 @@ void I_DetectOS(void)
{
if (info.dwMinorVersion == 0)
{
if (info.wProductType == VER_NT_WORKSTATION)
{
osname = "Vista";
}
else
{
osname = "Server 2008";
}
osname = (info.wProductType == VER_NT_WORKSTATION) ? "Vista" : "Server 2008";
}
else if (info.dwMinorVersion == 1)
{
if (info.wProductType == VER_NT_WORKSTATION)
{
osname = "7";
}
else
{
osname = "Server 2008 R2";
}
osname = (info.wProductType == VER_NT_WORKSTATION) ? "7" : "Server 2008 R2";
}
else if (info.dwMinorVersion == 2)
{
// Microsoft broke this API for 8.1 so without jumping through hoops it won't be possible anymore to detect never versions aside from the build number, especially for older compilers.
if (info.wProductType == VER_NT_WORKSTATION)
{
osname = "8 (or higher)";
}
else
{
osname = "Server 2012 (or higher)";
}
// Starting with Windows 8.1, you need to specify in your manifest
// the highest version of Windows you support, which will also be the
// highest version of Windows this function returns.
osname = (info.wProductType == VER_NT_WORKSTATION) ? "8" : "Server 2012";
}
else if (info.dwMinorVersion == 3)
{
osname = (info.wProductType == VER_NT_WORKSTATION) ? "8.1" : "Server 2012 R2";
}
else if (info.dwMinorVersion == 4)
{
osname = (info.wProductType == VER_NT_WORKSTATION) ? "10 (or higher)" : "Server 10 (or higher)";
}
}
break;

19
src/win32/zdoom.exe.manifest
View file

@ -5,4 +5,23 @@
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
</dependentAssembly>
</dependency>
<asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<dpiAware>true</dpiAware>
</asmv3:windowsSettings>
</asmv3:application>
<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>
</assembly>

20
zdoom.vcproj
View file

@ -117,6 +117,7 @@
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="src\win32\zdoom.exe.manifest"
SuppressStartupBanner="true"
AssemblyIdentity=""
/>
@ -233,6 +234,7 @@
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="src\win32\zdoom.exe.manifest"
/>
<Tool
Name="VCXDCMakeTool"
@ -339,6 +341,7 @@
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="src\win32\zdoom.exe.manifest"
/>
<Tool
Name="VCXDCMakeTool"
@ -446,6 +449,7 @@
/>
<Tool
Name="VCManifestTool"
AdditionalManifestFiles="src\win32\zdoom.exe.manifest"
/>
<Tool
Name="VCXDCMakeTool"
@ -2616,6 +2620,14 @@
RelativePath=".\src\oplsynth\muslib.h"
>
</File>
<File
RelativePath=".\src\oplsynth\nukedopl3.cpp"
>
</File>
<File
RelativePath=".\src\oplsynth\nukedopl3.h"
>
</File>
<File
RelativePath=".\src\oplsynth\opl.h"
>
@ -2632,14 +2644,6 @@
RelativePath=".\src\oplsynth\opl_mus_player.h"
>
</File>
<File
RelativePath=".\src\oplsynth\nukedopl3.cpp"
>
</File>
<File
RelativePath=".\src\oplsynth\nukedopl3.h"
>
</File>
<Filter
Name="DOSBox"
>