summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2018-12-28 01:08:14 +0100
committerCharles Pigott <charlespigott@googlemail.com>2019-01-17 23:02:11 +0000
commit98308fe26081b34e304bf83abf0a578dae379e31 (patch)
treeb10fd3f77d23ee82aa39fba3363194ab2b964163
parentd8ccad91f9f3c4554908c62a9e250ac61060d1ce (diff)
downloadopenttd-98308fe26081b34e304bf83abf0a578dae379e31.tar.xz
Fix 7f54c59a6: use some consistency for project dependencies determination
-rw-r--r--projects/openttd_vs140.sln7
-rw-r--r--projects/openttd_vs140.vcxproj8
-rw-r--r--projects/openttd_vs140.vcxproj.in8
-rw-r--r--projects/openttd_vs141.sln7
-rw-r--r--projects/openttd_vs141.vcxproj8
-rw-r--r--projects/openttd_vs141.vcxproj.in8
-rw-r--r--projects/settings_vs140.vcxproj6
-rw-r--r--projects/settings_vs140.vcxproj.in6
-rw-r--r--projects/settings_vs141.vcxproj6
-rw-r--r--projects/settings_vs141.vcxproj.in6
10 files changed, 56 insertions, 14 deletions
diff --git a/projects/openttd_vs140.sln b/projects/openttd_vs140.sln
index 32f3033fb..c9beb2a1e 100644
--- a/projects/openttd_vs140.sln
+++ b/projects/openttd_vs140.sln
@@ -4,10 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs140.vcxproj", "{668328A0-B40E-4CDB-BD72-D0064424414A}"
- ProjectSection(ProjectDependencies) = postProject
- {0817F629-589E-4A3B-B81A-8647BC571E35} = {0817F629-589E-4A3B-B81A-8647BC571E35}
- {E9548DE9-F089-49B7-93A6-30BE2CC311C7} = {E9548DE9-F089-49B7-93A6-30BE2CC311C7}
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen_vs140.vcxproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
EndProject
@@ -18,9 +14,6 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate", "generate_vs140.vcxproj", "{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settings", "settings_vs140.vcxproj", "{0817F629-589E-4A3B-B81A-8647BC571E35}"
- ProjectSection(ProjectDependencies) = postProject
- {E9548DE9-F089-49B7-93A6-30BE2CC311C7} = {E9548DE9-F089-49B7-93A6-30BE2CC311C7}
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settingsgen", "settingsgen_vs140.vcxproj", "{E9548DE9-F089-49B7-93A6-30BE2CC311C7}"
EndProject
diff --git a/projects/openttd_vs140.vcxproj b/projects/openttd_vs140.vcxproj
index 0ca84bed3..f08c26f09 100644
--- a/projects/openttd_vs140.vcxproj
+++ b/projects/openttd_vs140.vcxproj
@@ -1345,6 +1345,14 @@
<Project>{0f066b23-18df-4284-8265-f4a5e7e3b966}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
+ <ProjectReference Include="settingsgen_vs140.vcxproj">
+ <Project>{e9548de9-f089-49b7-93a6-30be2cc311c7}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="settings_vs140.vcxproj">
+ <Project>{0817f629-589e-4a3b-b81a-8647bc571e35}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
<ProjectReference Include="strgen_vs140.vcxproj">
<Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/projects/openttd_vs140.vcxproj.in b/projects/openttd_vs140.vcxproj.in
index 75aac94ba..c5e120401 100644
--- a/projects/openttd_vs140.vcxproj.in
+++ b/projects/openttd_vs140.vcxproj.in
@@ -349,6 +349,14 @@
<Project>{0f066b23-18df-4284-8265-f4a5e7e3b966}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
+ <ProjectReference Include="settingsgen_vs140.vcxproj">
+ <Project>{e9548de9-f089-49b7-93a6-30be2cc311c7}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="settings_vs140.vcxproj">
+ <Project>{0817f629-589e-4a3b-b81a-8647bc571e35}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
<ProjectReference Include="strgen_vs140.vcxproj">
<Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/projects/openttd_vs141.sln b/projects/openttd_vs141.sln
index 86f2685cd..f163125cb 100644
--- a/projects/openttd_vs141.sln
+++ b/projects/openttd_vs141.sln
@@ -4,10 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs141.vcxproj", "{668328A0-B40E-4CDB-BD72-D0064424414A}"
- ProjectSection(ProjectDependencies) = postProject
- {0817F629-589E-4A3B-B81A-8647BC571E35} = {0817F629-589E-4A3B-B81A-8647BC571E35}
- {E9548DE9-F089-49B7-93A6-30BE2CC311C7} = {E9548DE9-F089-49B7-93A6-30BE2CC311C7}
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen_vs141.vcxproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
EndProject
@@ -18,9 +14,6 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate", "generate_vs141.vcxproj", "{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settings", "settings_vs141.vcxproj", "{0817F629-589E-4A3B-B81A-8647BC571E35}"
- ProjectSection(ProjectDependencies) = postProject
- {E9548DE9-F089-49B7-93A6-30BE2CC311C7} = {E9548DE9-F089-49B7-93A6-30BE2CC311C7}
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settingsgen", "settingsgen_vs141.vcxproj", "{E9548DE9-F089-49B7-93A6-30BE2CC311C7}"
EndProject
diff --git a/projects/openttd_vs141.vcxproj b/projects/openttd_vs141.vcxproj
index ec563572f..552b9b9a9 100644
--- a/projects/openttd_vs141.vcxproj
+++ b/projects/openttd_vs141.vcxproj
@@ -1345,6 +1345,14 @@
<Project>{0f066b23-18df-4284-8265-f4a5e7e3b966}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
+ <ProjectReference Include="settingsgen_vs141.vcxproj">
+ <Project>{e9548de9-f089-49b7-93a6-30be2cc311c7}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="settings_vs141.vcxproj">
+ <Project>{0817f629-589e-4a3b-b81a-8647bc571e35}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
<ProjectReference Include="strgen_vs141.vcxproj">
<Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/projects/openttd_vs141.vcxproj.in b/projects/openttd_vs141.vcxproj.in
index a054c2580..2a8a78af7 100644
--- a/projects/openttd_vs141.vcxproj.in
+++ b/projects/openttd_vs141.vcxproj.in
@@ -349,6 +349,14 @@
<Project>{0f066b23-18df-4284-8265-f4a5e7e3b966}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
+ <ProjectReference Include="settingsgen_vs141.vcxproj">
+ <Project>{e9548de9-f089-49b7-93a6-30be2cc311c7}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="settings_vs141.vcxproj">
+ <Project>{0817f629-589e-4a3b-b81a-8647bc571e35}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
<ProjectReference Include="strgen_vs141.vcxproj">
<Project>{a133a442-bd0a-4ade-b117-ad7545e4bdd1}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/projects/settings_vs140.vcxproj b/projects/settings_vs140.vcxproj
index 4fe07dbd6..9952df47b 100644
--- a/projects/settings_vs140.vcxproj
+++ b/projects/settings_vs140.vcxproj
@@ -48,6 +48,12 @@
<None Include="..\src\table\settings.h.postamble" />
<None Include="..\src\table\settings.h.preamble" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="settingsgen_vs140.vcxproj">
+ <Project>{e9548de9-f089-49b7-93a6-30be2cc311c7}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/projects/settings_vs140.vcxproj.in b/projects/settings_vs140.vcxproj.in
index 71ea738dc..9bb0cc7f0 100644
--- a/projects/settings_vs140.vcxproj.in
+++ b/projects/settings_vs140.vcxproj.in
@@ -42,6 +42,12 @@
<None Include="..\src\table\settings.h.postamble" />
<None Include="..\src\table\settings.h.preamble" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="settingsgen_vs140.vcxproj">
+ <Project>{e9548de9-f089-49b7-93a6-30be2cc311c7}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/projects/settings_vs141.vcxproj b/projects/settings_vs141.vcxproj
index ed6f5bab1..9c20f1407 100644
--- a/projects/settings_vs141.vcxproj
+++ b/projects/settings_vs141.vcxproj
@@ -48,6 +48,12 @@
<None Include="..\src\table\settings.h.postamble" />
<None Include="..\src\table\settings.h.preamble" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="settingsgen_vs141.vcxproj">
+ <Project>{e9548de9-f089-49b7-93a6-30be2cc311c7}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/projects/settings_vs141.vcxproj.in b/projects/settings_vs141.vcxproj.in
index e4a60227c..23e044cc1 100644
--- a/projects/settings_vs141.vcxproj.in
+++ b/projects/settings_vs141.vcxproj.in
@@ -42,6 +42,12 @@
<None Include="..\src\table\settings.h.postamble" />
<None Include="..\src\table\settings.h.preamble" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="settingsgen_vs141.vcxproj">
+ <Project>{e9548de9-f089-49b7-93a6-30be2cc311c7}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>