miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redo Win10 dpi awareness fix and update VS projects

Browse Source
This commit is contained in:
Pavel Stupnikov
2017-04-10 23:26:41 +03:00
parent ee66bbe9aa
commit 83a55c8333
9 changed files with 143 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
projects/dpi_aware.manifest Normal file
View File

@@ -0,0 +1,7 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" >
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<dpiAware>True/PM</dpiAware>
</windowsSettings>
</application>
</assembly>

14
projects/openttd_vs100.vcxproj
View File

@@ -145,6 +145,9 @@
<TargetMachine>MachineX86</TargetMachine>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
<Manifest>
<AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -188,6 +191,9 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<Manifest>
<AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
@@ -244,6 +250,9 @@
<TargetMachine>MachineX64</TargetMachine>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
<Manifest>
<AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
@@ -289,6 +298,9 @@
<StackCommitSize>1048576</StackCommitSize>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<Manifest>
<AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\airport.cpp" />
@@ -839,6 +851,8 @@
<ClCompile Include="..\src\water_cmd.cpp" />
<ClCompile Include="..\src\waypoint_cmd.cpp" />
<ClCompile Include="..\src\zoning_cmd.cpp" />
<ClInclude Include="..\src\citymania\base64.h" />
<ClCompile Include="..\src\citymania\base64.cpp" />
<ClCompile Include="..\src\saveload\afterload.cpp" />
<ClCompile Include="..\src\saveload\ai_sl.cpp" />
<ClCompile Include="..\src\saveload\airport_sl.cpp" />

63
projects/openttd_vs100.vcxproj.filters
View File

@@ -19,87 +19,90 @@
<Filter Include="Command handlers">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000005}</UniqueIdentifier>
</Filter>
<Filter Include="Save/Load handlers">
<Filter Include="CityMania files">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000006}</UniqueIdentifier>
</Filter>
<Filter Include="Tables">
<Filter Include="Save/Load handlers">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000007}</UniqueIdentifier>
</Filter>
<Filter Include="MD5">
<Filter Include="Tables">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000008}</UniqueIdentifier>
</Filter>
<Filter Include="Script">
<Filter Include="MD5">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000009}</UniqueIdentifier>
</Filter>
<Filter Include="Squirrel">
<Filter Include="Script">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000010}</UniqueIdentifier>
</Filter>
<Filter Include="Squirrel headers">
<Filter Include="Squirrel">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000011}</UniqueIdentifier>
</Filter>
<Filter Include="AI Core">
<Filter Include="Squirrel headers">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000012}</UniqueIdentifier>
</Filter>
<Filter Include="AI API">
<Filter Include="AI Core">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000013}</UniqueIdentifier>
</Filter>
<Filter Include="Game API">
<Filter Include="AI API">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000014}</UniqueIdentifier>
</Filter>
<Filter Include="Game Core">
<Filter Include="Game API">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000015}</UniqueIdentifier>
</Filter>
<Filter Include="Script API">
<Filter Include="Game Core">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000016}</UniqueIdentifier>
</Filter>
<Filter Include="Script API Implementation">
<Filter Include="Script API">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000017}</UniqueIdentifier>
</Filter>
<Filter Include="Blitters">
<Filter Include="Script API Implementation">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000018}</UniqueIdentifier>
</Filter>
<Filter Include="Drivers">
<Filter Include="Blitters">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000019}</UniqueIdentifier>
</Filter>
<Filter Include="Sprite loaders">
<Filter Include="Drivers">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000020}</UniqueIdentifier>
</Filter>
<Filter Include="NewGRF">
<Filter Include="Sprite loaders">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000021}</UniqueIdentifier>
</Filter>
<Filter Include="Map Accessors">
<Filter Include="NewGRF">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000022}</UniqueIdentifier>
</Filter>
<Filter Include="Misc">
<Filter Include="Map Accessors">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000023}</UniqueIdentifier>
</Filter>
<Filter Include="Network Core">
<Filter Include="Misc">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000024}</UniqueIdentifier>
</Filter>
<Filter Include="Pathfinder">
<Filter Include="Network Core">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000025}</UniqueIdentifier>
</Filter>
<Filter Include="NPF">
<Filter Include="Pathfinder">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000026}</UniqueIdentifier>
</Filter>
<Filter Include="YAPF">
<Filter Include="NPF">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000027}</UniqueIdentifier>
</Filter>
<Filter Include="Video">
<Filter Include="YAPF">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000028}</UniqueIdentifier>
</Filter>
<Filter Include="Music">
<Filter Include="Video">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000029}</UniqueIdentifier>
</Filter>
<Filter Include="Sound">
<Filter Include="Music">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000030}</UniqueIdentifier>
</Filter>
<Filter Include="Windows files">
<Filter Include="Sound">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000031}</UniqueIdentifier>
</Filter>
<Filter Include="Threading">
<Filter Include="Windows files">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000032}</UniqueIdentifier>
</Filter>
<Filter Include="Threading">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000033}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\airport.cpp">
@@ -1746,6 +1749,12 @@
<ClCompile Include="..\src\zoning_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
<ClInclude Include="..\src\citymania\base64.h">
<Filter>CityMania files</Filter>
</ClInclude>
<ClCompile Include="..\src\citymania\base64.cpp">
<Filter>CityMania files</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\afterload.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>

12
projects/openttd_vs100.vcxproj.in
View File

@@ -145,6 +145,9 @@
<TargetMachine>MachineX86</TargetMachine>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
<Manifest>
<AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -188,6 +191,9 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<Manifest>
<AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
@@ -244,6 +250,9 @@
<TargetMachine>MachineX64</TargetMachine>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
<Manifest>
<AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
@@ -289,6 +298,9 @@
<StackCommitSize>1048576</StackCommitSize>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<Manifest>
<AdditionalManifestFiles>dpi_aware.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
!!FILES!!

2
projects/openttd_vs140.vcxproj
View File

@@ -868,6 +868,8 @@
<ClCompile Include="..\src\water_cmd.cpp" />
<ClCompile Include="..\src\waypoint_cmd.cpp" />
<ClCompile Include="..\src\zoning_cmd.cpp" />
<ClInclude Include="..\src\citymania\base64.h" />
<ClCompile Include="..\src\citymania\base64.cpp" />
<ClCompile Include="..\src\saveload\afterload.cpp" />
<ClCompile Include="..\src\saveload\ai_sl.cpp" />
<ClCompile Include="..\src\saveload\airport_sl.cpp" />

63
projects/openttd_vs140.vcxproj.filters
View File

@@ -19,87 +19,90 @@
<Filter Include="Command handlers">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000005}</UniqueIdentifier>
</Filter>
<Filter Include="Save/Load handlers">
<Filter Include="CityMania files">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000006}</UniqueIdentifier>
</Filter>
<Filter Include="Tables">
<Filter Include="Save/Load handlers">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000007}</UniqueIdentifier>
</Filter>
<Filter Include="MD5">
<Filter Include="Tables">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000008}</UniqueIdentifier>
</Filter>
<Filter Include="Script">
<Filter Include="MD5">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000009}</UniqueIdentifier>
</Filter>
<Filter Include="Squirrel">
<Filter Include="Script">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000010}</UniqueIdentifier>
</Filter>
<Filter Include="Squirrel headers">
<Filter Include="Squirrel">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000011}</UniqueIdentifier>
</Filter>
<Filter Include="AI Core">
<Filter Include="Squirrel headers">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000012}</UniqueIdentifier>
</Filter>
<Filter Include="AI API">
<Filter Include="AI Core">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000013}</UniqueIdentifier>
</Filter>
<Filter Include="Game API">
<Filter Include="AI API">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000014}</UniqueIdentifier>
</Filter>
<Filter Include="Game Core">
<Filter Include="Game API">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000015}</UniqueIdentifier>
</Filter>
<Filter Include="Script API">
<Filter Include="Game Core">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000016}</UniqueIdentifier>
</Filter>
<Filter Include="Script API Implementation">
<Filter Include="Script API">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000017}</UniqueIdentifier>
</Filter>
<Filter Include="Blitters">
<Filter Include="Script API Implementation">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000018}</UniqueIdentifier>
</Filter>
<Filter Include="Drivers">
<Filter Include="Blitters">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000019}</UniqueIdentifier>
</Filter>
<Filter Include="Sprite loaders">
<Filter Include="Drivers">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000020}</UniqueIdentifier>
</Filter>
<Filter Include="NewGRF">
<Filter Include="Sprite loaders">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000021}</UniqueIdentifier>
</Filter>
<Filter Include="Map Accessors">
<Filter Include="NewGRF">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000022}</UniqueIdentifier>
</Filter>
<Filter Include="Misc">
<Filter Include="Map Accessors">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000023}</UniqueIdentifier>
</Filter>
<Filter Include="Network Core">
<Filter Include="Misc">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000024}</UniqueIdentifier>
</Filter>
<Filter Include="Pathfinder">
<Filter Include="Network Core">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000025}</UniqueIdentifier>
</Filter>
<Filter Include="NPF">
<Filter Include="Pathfinder">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000026}</UniqueIdentifier>
</Filter>
<Filter Include="YAPF">
<Filter Include="NPF">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000027}</UniqueIdentifier>
</Filter>
<Filter Include="Video">
<Filter Include="YAPF">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000028}</UniqueIdentifier>
</Filter>
<Filter Include="Music">
<Filter Include="Video">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000029}</UniqueIdentifier>
</Filter>
<Filter Include="Sound">
<Filter Include="Music">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000030}</UniqueIdentifier>
</Filter>
<Filter Include="Windows files">
<Filter Include="Sound">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000031}</UniqueIdentifier>
</Filter>
<Filter Include="Threading">
<Filter Include="Windows files">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000032}</UniqueIdentifier>
</Filter>
<Filter Include="Threading">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000033}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\airport.cpp">
@@ -1746,6 +1749,12 @@
<ClCompile Include="..\src\zoning_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
<ClInclude Include="..\src\citymania\base64.h">
<Filter>CityMania files</Filter>
</ClInclude>
<ClCompile Include="..\src\citymania\base64.cpp">
<Filter>CityMania files</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\afterload.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>

12
projects/openttd_vs140.vcxproj.in
View File

@@ -151,6 +151,9 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<MinimumRequiredVersion>5.01</MinimumRequiredVersion>
</Link>
<Manifest>
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -198,6 +201,9 @@
<TargetMachine>MachineX86</TargetMachine>
<MinimumRequiredVersion>5.01</MinimumRequiredVersion>
</Link>
<Manifest>
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
@@ -257,6 +263,9 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
</Link>
<Manifest>
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
@@ -306,6 +315,9 @@
<TargetMachine>MachineX64</TargetMachine>
<MinimumRequiredVersion>5.02</MinimumRequiredVersion>
</Link>
<Manifest>
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
!!FILES!!

12
projects/openttd_vs80.vcproj
View File

@@ -2647,6 +2647,18 @@
>
</File>
</Filter>
<Filter
Name="CityMania files"
>
<File
RelativePath=".\..\src\citymania\base64.h"
>
</File>
<File
RelativePath=".\..\src\citymania\base64.cpp"
>
</File>
</Filter>
<Filter
Name="Save/Load handlers"
>

12
projects/openttd_vs90.vcproj
View File

@@ -2644,6 +2644,18 @@
>
</File>
</Filter>
<Filter
Name="CityMania files"
>
<File
RelativePath=".\..\src\citymania\base64.h"
>
</File>
<File
RelativePath=".\..\src\citymania\base64.cpp"
>
</File>
</Filter>
<Filter
Name="Save/Load handlers"
>