Mercurial > hg > openttd
changeset 7894:ea86dea6536d draft
(svn r11445) -Codechange: reorder <configuration> in openttd_vs80.vcproj, so there are less diff when it is modified by MSVC
author | glx <glx@openttd.org> |
---|---|
date | Fri, 16 Nov 2007 22:11:30 +0000 |
parents | 5cfe115b85fd |
children | 899d4210aa6d |
files | projects/generate projects/openttd_vs80.vcproj projects/openttd_vs80.vcproj.in |
diffstat | 3 files changed, 211 insertions(+), 211 deletions(-) [+] |
line wrap: on
line diff
--- a/projects/generate +++ b/projects/generate @@ -18,7 +18,7 @@ # openttd_vs80.sln is for MSVC 2005 # openttd_vs80.vcproj is for MSVC 2005 # langs_vs80.vcproj is for MSVC 2005 -# strgen_vs80.vcprojc is vor MSVC 2005 +# strgen_vs80.vcproj is for MSVC 2005 # openttd.sln is for MSVC 2003 # openttd.vcproj is for MSVC 2003
--- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -134,6 +134,103 @@ /> </Configuration> <Configuration + Name="Debug|Win32" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + Description="Determining version number" + CommandLine=""$(InputDir)/determineversion.vbs"" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM AMD64" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Debug/openttd.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\objs\langs" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + AssemblerListingLocation="$(IntDir)/" + ObjectFile="$(IntDir)/" + ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" + WarningLevel="3" + WarnAsError="false" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" + CallingConvention="1" + CompileAs="0" + /> + <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 libfreetype2.lib" + LinkIncremental="0" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="LIBCMT.lib" + GenerateDebugInformation="true" + SubSystem="2" + TargetMachine="1" + /> + <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="..\objs\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" @@ -248,103 +345,6 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" - IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="MASM AMD64" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Debug/openttd.tlb" - HeaderFileName="" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\objs\langs" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - AssemblerListingLocation="$(IntDir)/" - ObjectFile="$(IntDir)/" - ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" - WarningLevel="3" - WarnAsError="false" - SuppressStartupBanner="true" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="4" - CallingConvention="1" - CompileAs="0" - /> - <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 libfreetype2.lib" - LinkIncremental="0" - SuppressStartupBanner="true" - IgnoreDefaultLibraryNames="LIBCMT.lib" - GenerateDebugInformation="true" - SubSystem="2" - TargetMachine="1" - /> - <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|x64" OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" @@ -2064,6 +2064,14 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -2073,14 +2081,6 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration Name="Debug|x64" > <Tool
--- a/projects/openttd_vs80.vcproj.in +++ b/projects/openttd_vs80.vcproj.in @@ -134,6 +134,103 @@ /> </Configuration> <Configuration + Name="Debug|Win32" + OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + Description="Determining version number" + CommandLine=""$(InputDir)/determineversion.vbs"" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="MASM AMD64" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\Debug/openttd.tlb" + HeaderFileName="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\objs\langs" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + AssemblerListingLocation="$(IntDir)/" + ObjectFile="$(IntDir)/" + ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" + WarningLevel="3" + WarnAsError="false" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" + CallingConvention="1" + CompileAs="0" + /> + <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 libfreetype2.lib" + LinkIncremental="0" + SuppressStartupBanner="true" + IgnoreDefaultLibraryNames="LIBCMT.lib" + GenerateDebugInformation="true" + SubSystem="2" + TargetMachine="1" + /> + <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="..\objs\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" @@ -248,103 +345,6 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" - IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\" - ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="MASM AMD64" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TypeLibraryName=".\Debug/openttd.tlb" - HeaderFileName="" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\objs\langs" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\"" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - UsePrecompiledHeader="0" - AssemblerListingLocation="$(IntDir)/" - ObjectFile="$(IntDir)/" - ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb" - WarningLevel="3" - WarnAsError="false" - SuppressStartupBanner="true" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="4" - CallingConvention="1" - CompileAs="0" - /> - <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 libfreetype2.lib" - LinkIncremental="0" - SuppressStartupBanner="true" - IgnoreDefaultLibraryNames="LIBCMT.lib" - GenerateDebugInformation="true" - SubSystem="2" - TargetMachine="1" - /> - <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|x64" OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)" @@ -465,6 +465,14 @@ /> </FileConfiguration> <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration Name="Release|x64" > <Tool @@ -474,14 +482,6 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - <FileConfiguration Name="Debug|x64" > <Tool