mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-24 06:59:10 +00:00
Code Issues Activity

(svn r20598) -Codechange: [Win32] Replace the external x64 asm with a built-in Windows function.

Browse Source
This commit is contained in:
michi_cc
2010-08-23 18:19:15 +00:00
parent 56e05d1e2c
commit a7e8b67c7c
11 changed files with 14 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
projects/openttd_vs100.vcxproj
View File

@@ -47,9 +47,6 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
@@ -1089,17 +1086,6 @@
<ClInclude Include="..\src\thread\thread.h" />
<ClCompile Include="..\src\thread\thread_win32.cpp" />
</ItemGroup>
<ItemGroup>
<MASM Include="..\src\os\windows\win64.asm">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<PreserveIdentifierCase Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">1</PreserveIdentifierCase>
<PreservePublicAndExternSymbolCase Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PreservePublicAndExternSymbolCase>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<PreserveIdentifierCase Condition="'$(Configuration)|$(Platform)'=='Release|x64'">1</PreserveIdentifierCase>
<PreservePublicAndExternSymbolCase Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</PreservePublicAndExternSymbolCase>
<FileType>Document</FileType>
</MASM>
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />
<None Include="..\readme.txt" />
@@ -1119,7 +1105,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
</Project>

9
projects/openttd_vs100.vcxproj.filters
View File

@@ -91,10 +91,6 @@
<Filter Include="Threading">
<UniqueIdentifier>{c76ff9f1-1e62-46d8-8d55-000000000029}</UniqueIdentifier>
</Filter>
<Filter Include="64-bit Specific Files">
<UniqueIdentifier>{d55d5f1f-aa07-4839-80d7-5ae158609e61}</UniqueIdentifier>
<Extensions>asm</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\airport.cpp">
@@ -2472,9 +2468,4 @@
<None Include="..\media\openttd.ico" />
<None Include="..\readme.txt" />
</ItemGroup>
<ItemGroup>
<MASM Include="..\src\os\windows\win64.asm">
<Filter>64-bit Specific Files</Filter>
</MASM>
</ItemGroup>
</Project>

9
projects/openttd_vs100.vcxproj.filters.in
View File

@@ -2,10 +2,6 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
!!FILTERS!!
<Filter Include="64-bit Specific Files">
<UniqueIdentifier>{d55d5f1f-aa07-4839-80d7-5ae158609e61}</UniqueIdentifier>
<Extensions>asm</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
!!FILES!!
@@ -14,9 +10,4 @@
<None Include="..\media\openttd.ico" />
<None Include="..\readme.txt" />
</ItemGroup>
<ItemGroup>
<MASM Include="..\src\os\windows\win64.asm">
<Filter>64-bit Specific Files</Filter>
</MASM>
</ItemGroup>
</Project>

17
projects/openttd_vs100.vcxproj.in
View File

@@ -47,9 +47,6 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
@@ -300,17 +297,6 @@
<ItemGroup>
!!FILES!!
</ItemGroup>
<ItemGroup>
<MASM Include="..\src\os\windows\win64.asm">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<PreserveIdentifierCase Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">1</PreserveIdentifierCase>
<PreservePublicAndExternSymbolCase Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PreservePublicAndExternSymbolCase>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<PreserveIdentifierCase Condition="'$(Configuration)|$(Platform)'=='Release|x64'">1</PreserveIdentifierCase>
<PreservePublicAndExternSymbolCase Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</PreservePublicAndExternSymbolCase>
<FileType>Document</FileType>
</MASM>
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />
<None Include="..\readme.txt" />
@@ -330,7 +316,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
</Project>

60
projects/openttd_vs80.vcproj
View File

@@ -14,11 +14,6 @@
Name="x64"
/>
</Platforms>
<ToolFiles>
<ToolFile
RelativePath="..\src\os\windows\masm64.rules"
/>
</ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
@@ -37,9 +32,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -150,9 +142,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -249,9 +238,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -363,9 +349,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -3732,49 +3715,6 @@
>
</File>
</Filter>
<Filter
Name="64-bit Specific Files"
Filter="asm"
>
<File
RelativePath=".\..\src\os\windows\win64.asm"
>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="MASM AMD64"
PreserveIdentifierCase="true"
PreservePublicAndExternSymbolCase="true"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="MASM AMD64"
PreserveIdentifierCase="true"
PreservePublicAndExternSymbolCase="true"
/>
</FileConfiguration>
</File>
</Filter>
<File
RelativePath=".\..\media\openttd.ico"
>

60
projects/openttd_vs80.vcproj.in
View File

@@ -14,11 +14,6 @@
Name="x64"
/>
</Platforms>
<ToolFiles>
<ToolFile
RelativePath="..\src\os\windows\masm64.rules"
/>
</ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
@@ -37,9 +32,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -150,9 +142,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -249,9 +238,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -363,9 +349,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -453,49 +436,6 @@
</References>
<Files>
!!FILES!!
<Filter
Name="64-bit Specific Files"
Filter="asm"
>
<File
RelativePath=".\..\src\os\windows\win64.asm"
>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="MASM AMD64"
PreserveIdentifierCase="true"
PreservePublicAndExternSymbolCase="true"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="MASM AMD64"
PreserveIdentifierCase="true"
PreservePublicAndExternSymbolCase="true"
/>
</FileConfiguration>
</File>
</Filter>
<File
RelativePath=".\..\media\openttd.ico"
>

60
projects/openttd_vs90.vcproj
View File

@@ -15,11 +15,6 @@
Name="x64"
/>
</Platforms>
<ToolFiles>
<ToolFile
RelativePath="..\src\os\windows\masm64.rules"
/>
</ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
@@ -38,9 +33,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -149,9 +141,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -247,9 +236,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -360,9 +346,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -3729,49 +3712,6 @@
>
</File>
</Filter>
<Filter
Name="64-bit Specific Files"
Filter="asm"
>
<File
RelativePath=".\..\src\os\windows\win64.asm"
>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="MASM AMD64"
PreserveIdentifierCase="true"
PreservePublicAndExternSymbolCase="true"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="MASM AMD64"
PreserveIdentifierCase="true"
PreservePublicAndExternSymbolCase="true"
/>
</FileConfiguration>
</File>
</Filter>
<File
RelativePath=".\..\media\openttd.ico"
>

60
projects/openttd_vs90.vcproj.in
View File

@@ -15,11 +15,6 @@
Name="x64"
/>
</Platforms>
<ToolFiles>
<ToolFile
RelativePath="..\src\os\windows\masm64.rules"
/>
</ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
@@ -38,9 +33,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -149,9 +141,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -247,9 +236,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -360,9 +346,6 @@
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="MASM AMD64"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
@@ -450,49 +433,6 @@
</References>
<Files>
!!FILES!!
<Filter
Name="64-bit Specific Files"
Filter="asm"
>
<File
RelativePath=".\..\src\os\windows\win64.asm"
>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
<Tool
Name="MASM AMD64"
PreserveIdentifierCase="true"
PreservePublicAndExternSymbolCase="true"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="MASM AMD64"
PreserveIdentifierCase="true"
PreservePublicAndExternSymbolCase="true"
/>
</FileConfiguration>
</File>
</Filter>
<File
RelativePath=".\..\media\openttd.ico"
>