summaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorMichael Lutz <michi@icosahedron.de>2019-03-17 01:59:46 +0100
committerMichael Lutz <michi@icosahedron.de>2019-04-06 11:27:39 +0200
commit05bc2ed7cbe07cb4cd535932f10778b35f72e944 (patch)
tree0faaf12fd1bafb0786236ffc82052e8b83dfca60 /projects
parent05f4e7360886e36b221ef5c3af4426625a3de686 (diff)
downloadopenttd-05bc2ed7cbe07cb4cd535932f10778b35f72e944.tar.xz
Codechange: Replace custom thread code with C++11 thread objects.
We assume a conforming C++11 compiler environment that has a valid <thread>-header. Failure to run a real thread is handled gracefully.
Diffstat (limited to 'projects')
-rw-r--r--projects/openttd_vs140.vcxproj3
-rw-r--r--projects/openttd_vs140.vcxproj.filters5
-rw-r--r--projects/openttd_vs141.vcxproj3
-rw-r--r--projects/openttd_vs141.vcxproj.filters5
-rw-r--r--projects/openttd_vs142.vcxproj3
-rw-r--r--projects/openttd_vs142.vcxproj.filters5
6 files changed, 6 insertions, 18 deletions
diff --git a/projects/openttd_vs140.vcxproj b/projects/openttd_vs140.vcxproj
index 473dfcda4..f437e2c89 100644
--- a/projects/openttd_vs140.vcxproj
+++ b/projects/openttd_vs140.vcxproj
@@ -1334,8 +1334,7 @@
<ResourceCompile Include="..\src\os\windows\ottdres.rc" />
<ClCompile Include="..\src\os\windows\string_uniscribe.cpp" />
<ClCompile Include="..\src\os\windows\win32.cpp" />
- <ClInclude Include="..\src\thread\thread.h" />
- <ClCompile Include="..\src\thread\thread_win32.cpp" />
+ <ClInclude Include="..\src\thread.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />
diff --git a/projects/openttd_vs140.vcxproj.filters b/projects/openttd_vs140.vcxproj.filters
index 9a468836b..399894b73 100644
--- a/projects/openttd_vs140.vcxproj.filters
+++ b/projects/openttd_vs140.vcxproj.filters
@@ -3090,12 +3090,9 @@
<ClCompile Include="..\src\os\windows\win32.cpp">
<Filter>Windows files</Filter>
</ClCompile>
- <ClInclude Include="..\src\thread\thread.h">
+ <ClInclude Include="..\src\thread.h">
<Filter>Threading</Filter>
</ClInclude>
- <ClCompile Include="..\src\thread\thread_win32.cpp">
- <Filter>Threading</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />
diff --git a/projects/openttd_vs141.vcxproj b/projects/openttd_vs141.vcxproj
index 2a963bfa2..89b9d0217 100644
--- a/projects/openttd_vs141.vcxproj
+++ b/projects/openttd_vs141.vcxproj
@@ -1334,8 +1334,7 @@
<ResourceCompile Include="..\src\os\windows\ottdres.rc" />
<ClCompile Include="..\src\os\windows\string_uniscribe.cpp" />
<ClCompile Include="..\src\os\windows\win32.cpp" />
- <ClInclude Include="..\src\thread\thread.h" />
- <ClCompile Include="..\src\thread\thread_win32.cpp" />
+ <ClInclude Include="..\src\thread.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />
diff --git a/projects/openttd_vs141.vcxproj.filters b/projects/openttd_vs141.vcxproj.filters
index 9a468836b..399894b73 100644
--- a/projects/openttd_vs141.vcxproj.filters
+++ b/projects/openttd_vs141.vcxproj.filters
@@ -3090,12 +3090,9 @@
<ClCompile Include="..\src\os\windows\win32.cpp">
<Filter>Windows files</Filter>
</ClCompile>
- <ClInclude Include="..\src\thread\thread.h">
+ <ClInclude Include="..\src\thread.h">
<Filter>Threading</Filter>
</ClInclude>
- <ClCompile Include="..\src\thread\thread_win32.cpp">
- <Filter>Threading</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />
diff --git a/projects/openttd_vs142.vcxproj b/projects/openttd_vs142.vcxproj
index f4c76e097..a3ac8fd36 100644
--- a/projects/openttd_vs142.vcxproj
+++ b/projects/openttd_vs142.vcxproj
@@ -1334,8 +1334,7 @@
<ResourceCompile Include="..\src\os\windows\ottdres.rc" />
<ClCompile Include="..\src\os\windows\string_uniscribe.cpp" />
<ClCompile Include="..\src\os\windows\win32.cpp" />
- <ClInclude Include="..\src\thread\thread.h" />
- <ClCompile Include="..\src\thread\thread_win32.cpp" />
+ <ClInclude Include="..\src\thread.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />
diff --git a/projects/openttd_vs142.vcxproj.filters b/projects/openttd_vs142.vcxproj.filters
index 9a468836b..399894b73 100644
--- a/projects/openttd_vs142.vcxproj.filters
+++ b/projects/openttd_vs142.vcxproj.filters
@@ -3090,12 +3090,9 @@
<ClCompile Include="..\src\os\windows\win32.cpp">
<Filter>Windows files</Filter>
</ClCompile>
- <ClInclude Include="..\src\thread\thread.h">
+ <ClInclude Include="..\src\thread.h">
<Filter>Threading</Filter>
</ClInclude>
- <ClCompile Include="..\src\thread\thread_win32.cpp">
- <Filter>Threading</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\media\openttd.ico" />