summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <Darkvater@openttd.org>2006-08-09 08:48:33 +0000
committerDarkvater <Darkvater@openttd.org>2006-08-09 08:48:33 +0000
commit83290e8ceac10f3c57e6698b1623cbc98f1e7e8e (patch)
treecc73505e3636215e3759e5d259fcb892ad77c591
parenteef4faa4e3fd0f663e3cc5d6df1b0ef8d5c0a431 (diff)
downloadopenttd-83290e8ceac10f3c57e6698b1623cbc98f1e7e8e.tar.xz
(svn r5813) Add x64 target to VS2005 project files (michi_cc)
-rw-r--r--masm64.rules266
-rw-r--r--openttd_vs80.sln18
-rw-r--r--openttd_vs80.vcproj357
-rw-r--r--yapf/unittest/unittest_vs80.vcproj159
4 files changed, 800 insertions, 0 deletions
diff --git a/masm64.rules b/masm64.rules
new file mode 100644
index 000000000..8444fa3f6
--- /dev/null
+++ b/masm64.rules
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VisualStudioToolFile
+ Name="Microsoft Macro Assembler 64"
+ Version="8.00"
+ >
+ <Rules>
+ <CustomBuildRule
+ Name="MASM AMD64"
+ DisplayName="Microsoft Macro Assembler for AMD64"
+ CommandLine="ml64.exe /c [AllOptions] [AdditionalOptions] /Ta[inputs]"
+ Outputs="[$ObjectFileName]"
+ FileExtensions="*.asm"
+ ExecutionDescription="Assembling..."
+ >
+ <Properties>
+ <BooleanProperty
+ Name="NoLogo"
+ DisplayName="Suppress Startup Banner"
+ Description="Suppress the display of the startup banner and information messages. (/nologo)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/nologo"
+ DefaultValue="true"
+ />
+ <StringProperty
+ Name="ObjectFileName"
+ DisplayName="Object File Name"
+ PropertyPageName="Object File"
+ Description="Specifies the name of the output object file. (/Fo:[file])"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Fo&quot;[value]&quot;"
+ DefaultValue="$(IntDir)\$(InputName).obj"
+ />
+ <BooleanProperty
+ Name="PreserveIdentifierCase"
+ DisplayName="Preserve Identifier Case"
+ PropertyPageName="Identifiers"
+ Description="Preserves case of all user identifiers. (/Cp)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Cp"
+ />
+ <BooleanProperty
+ Name="PreservePublicAndExternSymbolCase"
+ DisplayName="Preserve Public and Extern Symbol Case"
+ PropertyPageName="Identifiers"
+ Description="Preserves case in public and extern symbols. (/Cx)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Cx"
+ />
+ <StringProperty
+ Name="PreprocessorDefinitions"
+ DisplayName="Preprocessor Definitions"
+ Description="Defines a text macro with the given name. (/D[symbol])"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/D&quot;[value]&quot;"
+ Delimited="true"
+ Inheritable="true"
+ />
+ <BooleanProperty
+ Name="GeneratePreprocessedSourceListing"
+ DisplayName="Generate Preprocessed Source Listing"
+ PropertyPageName="Listing File"
+ Description="Generates a preprocessed source listing to the Output Window. (/EP)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/EP"
+ />
+ <StringProperty
+ Name="AssembledCodeListingFile"
+ DisplayName="Assembled Code Listing File"
+ PropertyPageName="Listing File"
+ Description="Generates an assembled code listing file. (/Fl[file])"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Fl&quot;[value]&quot;"
+ />
+ <StringProperty
+ Name="SourceBrowserFile"
+ DisplayName="Source Browser File"
+ PropertyPageName="Source Browser File"
+ Description="Generates a source browser .sbr file. (/Fr[file])"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Fr&quot;[value]&quot;"
+ />
+ <StringProperty
+ Name="ExtendedSourceBrowserFile"
+ DisplayName="Extended Source Browser File"
+ PropertyPageName="Source Browser File"
+ Description="Generates an extended form of a source browser .sbr file. (/FR[file])"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/FR&quot;[value]&quot;"
+ />
+ <StringProperty
+ Name="IncludePaths"
+ DisplayName="Include Paths"
+ Description="Sets path for include file. A maximum of 10 /I options is allowed. (/I [path])"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/I &quot;[value]&quot;"
+ Delimited="true"
+ Inheritable="true"
+ />
+ <BooleanProperty
+ Name="ListAllAvailableInformation"
+ DisplayName="List All Available Information"
+ PropertyPageName="Listing File"
+ Description="Turns on listing of all available information. (/Sa)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Sa"
+ />
+ <BooleanProperty
+ Name="AddInstructionTimings"
+ DisplayName="Add Instruction Timings"
+ PropertyPageName="Listing File"
+ Description="Adds instruction timings to listing file. (/Sc)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Sc"
+ />
+ <BooleanProperty
+ Name="AddFirstPassListing"
+ DisplayName="Add First Pass Listing"
+ PropertyPageName="Listing File"
+ Description="Adds first-pass listing to listing file. (/Sf)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Sf"
+ />
+ <IntegerProperty
+ Name="SourceListingLineWidth"
+ DisplayName="Source Listing Line Width"
+ PropertyPageName="Listing File"
+ Description="Sets the line width of source listing in characters per line. Range is 60 to 255 or 0. Default is 0. Same as PAGE width. (/Sl [width])"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Sl [value]"
+ />
+ <BooleanProperty
+ Name="DisableSymbolTable"
+ DisplayName="Disable Symbol Table"
+ PropertyPageName="Listing File"
+ Description="Turns off symbol table when producing a listing. (/Sn)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Sn"
+ />
+ <IntegerProperty
+ Name="SourceListingPageLength"
+ DisplayName="Source Listing Page Length"
+ PropertyPageName="Listing File"
+ Description="Sets the page length of source listing in lines per page. Range is 10 to 255 or 0. Default is 0. Same as PAGE length. (/Sp [length])"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Sp [value]"
+ />
+ <StringProperty
+ Name="SourceListingSubTitle"
+ DisplayName="Source Listing Subtitle"
+ PropertyPageName="Listing File"
+ Description="Specifies subtitle text for source listing. Same as SUBTITLE text. (/Ss [subtitle])"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Ss [value]"
+ />
+ <StringProperty
+ Name="SourceListingTitle"
+ DisplayName="Source Listing Title"
+ PropertyPageName="Listing File"
+ Description="Specifies title for source listing. Same as TITLE text. (/St [title])"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/St [value]"
+ />
+ <BooleanProperty
+ Name="EnableFalseConditionalsInListing"
+ DisplayName="Enable False Conditionals In Listing"
+ PropertyPageName="Listing File"
+ Description="Turns on false conditionals in listing. (/Sx)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Sx"
+ />
+ <EnumProperty
+ Name="WarningLevel"
+ DisplayName="Warning Level"
+ Description="Sets the warning level, where level = 0, 1, 2, or 3. (/W0, /W1, /W2, /W3)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ >
+ <Values>
+ <EnumValue
+ Value="0"
+ Switch="/W0"
+ DisplayName="Warning Level 0 (/W0)"
+ />
+ <EnumValue
+ Value="1"
+ Switch="/W1"
+ DisplayName="Warning Level 1 (/W1)"
+ />
+ <EnumValue
+ Value="2"
+ Switch="/W2"
+ DisplayName="Warning Level 2 (/W2)"
+ />
+ <EnumValue
+ Value="3"
+ Switch="/W3"
+ DisplayName="Warning Level 3 (/W3)"
+ />
+ </Values>
+ </EnumProperty>
+ <BooleanProperty
+ Name="TreatWarningsAsErrors"
+ DisplayName="Treat Warnings As Errors"
+ Description="Returns an error code if warnings are generated. (/WX)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/WX"
+ />
+ <BooleanProperty
+ Name="GenerateLineInformation"
+ DisplayName="Generate Line Information"
+ PropertyPageName="Object File"
+ Description="Generates line-number information in object file. (/Zd)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Zd"
+ />
+ <BooleanProperty
+ Name="MakeAllSymbolsPublic"
+ DisplayName="Make All Symbols Public"
+ PropertyPageName="Object File"
+ Description="Makes all symbols public. (/Zf)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Zf"
+ />
+ <BooleanProperty
+ Name="GenerateCodeViewInformation"
+ DisplayName="Generate CodeView Information"
+ PropertyPageName="Object File"
+ Description="Generates CodeView information in object file. (/Zi)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Zi"
+ />
+ <EnumProperty
+ Name="PackAlignmentBoundary"
+ DisplayName="Pack Alignment Boundary"
+ PropertyPageName="Advanced"
+ Description="Packs structures on the specified byte boundary. The alignment can be 1, 2, or 4. (/Zp1, /Zp2, /Zp4)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ >
+ <Values>
+ <EnumValue
+ Value="0"
+ Switch="/Zp1"
+ DisplayName="One Byte Boundary (/Zp1)"
+ />
+ <EnumValue
+ Value="1"
+ Switch="/Zp2"
+ DisplayName="Two Byte Boundary (/Zp2)"
+ />
+ <EnumValue
+ Value="2"
+ Switch="/Zp4"
+ DisplayName="Four Byte Boundary (/Zp4)"
+ />
+ </Values>
+ </EnumProperty>
+ <BooleanProperty
+ Name="PerformSyntaxCheckOnly"
+ DisplayName="Perform Syntax Check Only"
+ Description="Performs a syntax check only. (/Zs)"
+ HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+ Switch="/Zs"
+ />
+ </Properties>
+ </CustomBuildRule>
+ </Rules>
+</VisualStudioToolFile>
diff --git a/openttd_vs80.sln b/openttd_vs80.sln
index bb2c6225c..130cbfa32 100644
--- a/openttd_vs80.sln
+++ b/openttd_vs80.sln
@@ -18,25 +18,43 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.ActiveCfg = Debug|Win32
{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|Win32.Build.0 = Debug|Win32
+ {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.ActiveCfg = Debug|Win32
+ {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug|x64.Build.0 = Debug|Win32
{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.ActiveCfg = Debug|Win32
{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|Win32.Build.0 = Debug|Win32
+ {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.ActiveCfg = Debug|Win32
+ {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release|x64.Build.0 = Debug|Win32
{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.ActiveCfg = Debug|Win32
{668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|Win32.Build.0 = Debug|Win32
+ {668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.ActiveCfg = Debug|x64
+ {668328A0-B40E-4CDB-BD72-D0064424414A}.Debug|x64.Build.0 = Debug|x64
{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.ActiveCfg = Release|Win32
{668328A0-B40E-4CDB-BD72-D0064424414A}.Release|Win32.Build.0 = Release|Win32
+ {668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.ActiveCfg = Release|x64
+ {668328A0-B40E-4CDB-BD72-D0064424414A}.Release|x64.Build.0 = Release|x64
{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.ActiveCfg = Debug|Win32
{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|Win32.Build.0 = Debug|Win32
+ {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.ActiveCfg = Debug|Win32
+ {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug|x64.Build.0 = Debug|Win32
{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.ActiveCfg = Debug|Win32
{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.Build.0 = Debug|Win32
+ {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.ActiveCfg = Debug|Win32
+ {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.Build.0 = Debug|Win32
{4AECBDC3-D57E-4AFB-90BD-DDF10707588C}.Debug|Win32.ActiveCfg = Debug|Win32
{4AECBDC3-D57E-4AFB-90BD-DDF10707588C}.Debug|Win32.Build.0 = Debug|Win32
+ {4AECBDC3-D57E-4AFB-90BD-DDF10707588C}.Debug|x64.ActiveCfg = Debug|x64
+ {4AECBDC3-D57E-4AFB-90BD-DDF10707588C}.Debug|x64.Build.0 = Debug|x64
{4AECBDC3-D57E-4AFB-90BD-DDF10707588C}.Release|Win32.ActiveCfg = Release|Win32
{4AECBDC3-D57E-4AFB-90BD-DDF10707588C}.Release|Win32.Build.0 = Release|Win32
+ {4AECBDC3-D57E-4AFB-90BD-DDF10707588C}.Release|x64.ActiveCfg = Release|x64
+ {4AECBDC3-D57E-4AFB-90BD-DDF10707588C}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/openttd_vs80.vcproj b/openttd_vs80.vcproj
index f7740f623..9615cfe46 100644
--- a/openttd_vs80.vcproj
+++ b/openttd_vs80.vcproj
@@ -10,8 +10,14 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
+ <DefaultToolFile
+ FileName="masm64.rules"
+ />
</ToolFiles>
<Configurations>
<Configuration
@@ -32,6 +38,9 @@
Name="VCCustomBuildTool"
/>
<Tool
+ Name="MASM AMD64"
+ />
+ <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
@@ -123,6 +132,118 @@
/>
</Configuration>
<Configuration
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="MASM AMD64"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\Release/openttd.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="2"
+ OmitFramePointers="true"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;ENABLE_NETWORK"
+ StringPooling="true"
+ ExceptionHandling="1"
+ RuntimeLibrary="0"
+ StructMemberAlignment="0"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="true"
+ DefaultCharIsUnsigned="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
+ AssemblerOutput="2"
+ AssemblerListingLocation=".\$(ConfigurationName)\"
+ ObjectFile=".\$(ConfigurationName)\"
+ ProgramDataBaseFileName=".\$(ConfigurationName)\"
+ BrowseInformation="1"
+ WarningLevel="3"
+ WarnAsError="false"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CallingConvention="1"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1053"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib"
+ OutputFile=".\$(PlatformName)\$(ConfigurationName)\openttd.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(ConfigurationName)\openttd.pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ OptimizeForWindows98="1"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
Name="Debug|Win32"
OutputDirectory=".\$(ConfigurationName)\"
IntermediateDirectory=".\$(ConfigurationName)\"
@@ -139,6 +260,9 @@
Name="VCCustomBuildTool"
/>
<Tool
+ Name="MASM AMD64"
+ />
+ <Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
@@ -217,6 +341,105 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="MASM AMD64"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ TypeLibraryName=".\Debug/openttd.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;ENABLE_NETWORK"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ PrecompiledHeaderFile=""
+ AssemblerListingLocation=".\$(ConfigurationName)\"
+ ObjectFile=".\$(ConfigurationName)\"
+ ProgramDataBaseFileName=".\$(ConfigurationName)\"
+ WarningLevel="3"
+ WarnAsError="false"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ CallingConvention="0"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1053"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib"
+ OutputFile=".\$(PlatformName)\$(ConfigurationName)\openttd.exe"
+ LinkIncremental="0"
+ SuppressStartupBanner="true"
+ IgnoreDefaultLibraryNames="LIBCMT.lib"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\$(ConfigurationName)\openttd.pdb"
+ SubSystem="2"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
@@ -281,6 +504,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="Debug|Win32"
>
<Tool
@@ -288,6 +519,14 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath=".\driver.c"
@@ -550,6 +789,44 @@
>
</File>
<File
+ RelativePath=".\win64.asm"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="MASM AMD64"
+ PreserveIdentifierCase="true"
+ PreservePublicAndExternSymbolCase="true"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="MASM AMD64"
+ PreserveIdentifierCase="true"
+ PreservePublicAndExternSymbolCase="true"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath=".\window.c"
>
</File>
@@ -1330,6 +1607,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="Debug|Win32"
>
<Tool
@@ -1337,6 +1622,14 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath=".\yapf\follow_track.hpp"
@@ -1378,6 +1671,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="Debug|Win32"
>
<Tool
@@ -1385,6 +1686,14 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath=".\yapf\yapf_common.hpp"
@@ -1430,6 +1739,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="Debug|Win32"
>
<Tool
@@ -1437,6 +1754,14 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath=".\yapf\yapf_road.cpp"
@@ -1450,6 +1775,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="Debug|Win32"
>
<Tool
@@ -1457,6 +1790,14 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath=".\yapf\yapf_settings.h"
@@ -1474,6 +1815,14 @@
/>
</FileConfiguration>
<FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="Debug|Win32"
>
<Tool
@@ -1481,6 +1830,14 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
</File>
</Filter>
<File
diff --git a/yapf/unittest/unittest_vs80.vcproj b/yapf/unittest/unittest_vs80.vcproj
index 467b5ede6..cbf1815ed 100644
--- a/yapf/unittest/unittest_vs80.vcproj
+++ b/yapf/unittest/unittest_vs80.vcproj
@@ -11,6 +11,9 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -169,6 +172,162 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/unittest.exe"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/unittest.pdb"
+ SubSystem="1"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(OutDir)/unittest.exe"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>