Mercurial > hg > openttd
changeset 9854:d7ed2065524c draft
(svn r13998) -Fix [FS#2004]: MSVC can't handle changed files in the prebuild event, so make the version determination a separate subproject (michi_cc).
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Mon, 04 Aug 2008 21:51:52 +0000 |
| parents | a1dfe725d2f9 |
| children | a3916adebd9a |
| files | projects/openttd_vs80.sln projects/openttd_vs80.vcproj projects/openttd_vs80.vcproj.in projects/openttd_vs90.sln projects/openttd_vs90.vcproj projects/openttd_vs90.vcproj.in projects/version_vs80.vcproj projects/version_vs90.vcproj |
| diffstat | 8 files changed, 111 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/projects/openttd_vs80.sln +++ b/projects/openttd_vs80.sln @@ -4,6 +4,7 @@ ProjectSection(ProjectDependencies) = postProject {0F066B23-18DF-4284-8265-F4A5E7E3B966} = {0F066B23-18DF-4284-8265-F4A5E7E3B966} {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC} = {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen_vs80.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}" @@ -13,6 +14,8 @@ {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version_vs80.vcproj", "{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -45,6 +48,14 @@ {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 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.ActiveCfg = Debug|Win32 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.Build.0 = Debug|Win32 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.ActiveCfg = Debug|Win32 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.Build.0 = Debug|Win32 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.ActiveCfg = Debug|Win32 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.Build.0 = Debug|Win32 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.ActiveCfg = Debug|Win32 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.Build.0 = Debug|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE
--- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -33,8 +33,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -145,8 +143,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -243,8 +239,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -356,8 +350,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool"
--- a/projects/openttd_vs80.vcproj.in +++ b/projects/openttd_vs80.vcproj.in @@ -33,8 +33,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -145,8 +143,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -243,8 +239,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -356,8 +350,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool"
--- a/projects/openttd_vs90.sln +++ b/projects/openttd_vs90.sln @@ -4,6 +4,7 @@ ProjectSection(ProjectDependencies) = postProject {0F066B23-18DF-4284-8265-F4A5E7E3B966} = {0F066B23-18DF-4284-8265-F4A5E7E3B966} {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC} = {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen_vs90.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}" @@ -13,6 +14,8 @@ {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version_vs90.vcproj", "{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -45,6 +48,14 @@ {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 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.ActiveCfg = Debug|Win32 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.Build.0 = Debug|Win32 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.ActiveCfg = Debug|Win32 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.Build.0 = Debug|Win32 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.ActiveCfg = Debug|Win32 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.Build.0 = Debug|Win32 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.ActiveCfg = Debug|Win32 + {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.Build.0 = Debug|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE
--- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -34,8 +34,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -144,8 +142,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -241,8 +237,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -353,8 +347,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool"
--- a/projects/openttd_vs90.vcproj.in +++ b/projects/openttd_vs90.vcproj.in @@ -34,8 +34,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -144,8 +142,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -241,8 +237,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool" @@ -353,8 +347,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Determining version number" - CommandLine=""$(InputDir)/determineversion.vbs"" /> <Tool Name="VCCustomBuildTool"
new file mode 100644 --- /dev/null +++ b/projects/version_vs80.vcproj @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="version" + ProjectGUID="{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}" + RootNamespace="version" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + Description="Determining version number" + CommandLine=""$(InputDir)/determineversion.vbs"" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="..\src\rev.cpp.in" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject>
new file mode 100644 --- /dev/null +++ b/projects/version_vs90.vcproj @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="version" + ProjectGUID="{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}" + RootNamespace="version" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="10" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + Description="Determining version number" + CommandLine=""$(InputDir)/determineversion.vbs"" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="..\src\rev.cpp.in" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject>