Merge branches 'crashlog_improvements', 'save_ext' into jgrpp

# Conflicts: # Makefile.src.in # projects/openttd_vs140.vcxproj # projects/openttd_vs140.vcxproj.filters # projects/openttd_vs141.vcxproj # projects/openttd_vs141.vcxproj.filters # projects/openttd_vs142.vcxproj # projects/openttd_vs142.vcxproj.filters # src/core/smallstack_type.hpp # src/linkgraph/linkgraphjob.cpp # src/linkgraph/linkgraphjob.h # src/misc.cpp # src/network/network_udp.cpp # src/openttd.cpp # src/saveload/saveload.cpp
2019-04-09 19:06:26 +01:00
parent 070160af40 d5ee9d34da 7f80884047
commit 361758b516
60 changed files with 541 additions and 1236 deletions
--- a/projects/generate_vs142.vcxproj
+++ b/projects/generate_vs142.vcxproj
@@ -10,7 +10,6 @@
    <ProjectName>generate</ProjectName>
    <ProjectGuid>{2F31FD79-D1AC-43C4-89F3-B0D5E4E53E34}</ProjectGuid>
    <RootNamespace>generate</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--- a/projects/openttd_vs140.vcxproj
+++ b/projects/openttd_vs140.vcxproj
@@ -1389,8 +1389,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" />
    <ClInclude Include="..\src\tracerestrict.h" />
    <ClCompile Include="..\src\tracerestrict.cpp" />
    <ClCompile Include="..\src\tracerestrict_gui.cpp" />
--- a/projects/openttd_vs140.vcxproj.filters
+++ b/projects/openttd_vs140.vcxproj.filters
@@ -3258,12 +3258,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>
    <ClInclude Include="..\src\tracerestrict.h">
      <Filter>Threading</Filter>
    </ClInclude>
--- a/projects/openttd_vs141.vcxproj
+++ b/projects/openttd_vs141.vcxproj
@@ -1389,8 +1389,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" />
    <ClInclude Include="..\src\tracerestrict.h" />
    <ClCompile Include="..\src\tracerestrict.cpp" />
    <ClCompile Include="..\src\tracerestrict_gui.cpp" />
--- a/projects/openttd_vs141.vcxproj.filters
+++ b/projects/openttd_vs141.vcxproj.filters
@@ -3258,12 +3258,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>
    <ClInclude Include="..\src\tracerestrict.h">
      <Filter>Threading</Filter>
    </ClInclude>
--- a/projects/openttd_vs142.vcxproj
+++ b/projects/openttd_vs142.vcxproj
@@ -1389,8 +1389,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" />
    <ClInclude Include="..\src\tracerestrict.h" />
    <ClCompile Include="..\src\tracerestrict.cpp" />
    <ClCompile Include="..\src\tracerestrict_gui.cpp" />
--- a/projects/openttd_vs142.vcxproj.filters
+++ b/projects/openttd_vs142.vcxproj.filters
@@ -3258,12 +3258,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>
    <ClInclude Include="..\src\tracerestrict.h">
      <Filter>Threading</Filter>
    </ClInclude>
--- a/projects/settingsgen_vs142.vcxproj
+++ b/projects/settingsgen_vs142.vcxproj
@@ -10,7 +10,6 @@
    <ProjectName>settingsgen</ProjectName>
    <ProjectGuid>{E9548DE9-F089-49B7-93A6-30BE2CC311C7}</ProjectGuid>
    <RootNamespace>settings</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
--- a/projects/strgen_vs142.vcxproj
+++ b/projects/strgen_vs142.vcxproj
@@ -10,7 +10,6 @@
    <ProjectName>strgen</ProjectName>
    <ProjectGuid>{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}</ProjectGuid>
    <RootNamespace>strgen</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">