MinGW: Remove direct mingw-std-threads includes

src/debug.cpp

@@ -18,9 +18,6 @@
 #include "thread.h"
 #include <array>
 #include <mutex>
-#if defined(__MINGW32__)
-#include "3rdparty/mingw-std-threads/mingw.mutex.h"
-#endif
 
 #if defined(_WIN32)
 #include "os/windows/win32.h"

src/framerate_gui.cpp

@@ -28,9 +28,6 @@
 
 #include <atomic>
 #include <mutex>
-#if defined(__MINGW32__)
-#include "3rdparty/mingw-std-threads/mingw.mutex.h"
-#endif
 #include <vector>
 
 #include "safeguards.h"

src/genworld.h

@@ -12,9 +12,6 @@
 
 #include "company_type.h"
 #include <thread>
-#if defined(__MINGW32__)
-#include "3rdparty/mingw-std-threads/mingw.thread.h"
-#endif
 
 /** Constants related to world generation */
 enum LandscapeGenerator {

src/mixer.cpp

@@ -19,9 +19,6 @@
 #include "safeguards.h"
 
 #include <mutex>
-#if defined(__MINGW32__)
-#include "3rdparty/mingw-std-threads/mingw.mutex.h"
-#endif
 
 struct MixerChannel {
 	/* pointer to allocated buffer memory */

src/music/dmusic.cpp

@@ -26,9 +26,6 @@
 #include <dmksctrl.h>
 #include <dmusicc.h>
 #include <mutex>
-#if defined(__MINGW32__)
-#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
-#endif
 
 #include "../safeguards.h"
 

src/music/fluidsynth.cpp

@@ -16,9 +16,6 @@
 #include <fluidsynth.h>
 #include "../mixer.h"
 #include <mutex>
-#if defined(__MINGW32__)
-#include "3rdparty/mingw-std-threads/mingw.mutex.h"
-#endif
 
 static struct {
 	fluid_settings_t *settings;    ///< FluidSynth settings handle

src/music/music_driver.hpp

@@ -14,9 +14,6 @@
 
 #include <memory>
 #include <mutex>
-#if defined(__MINGW32__)
-#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
-#endif
 
 extern std::mutex _music_driver_mutex;
 

src/music/win32_m.cpp

@@ -19,10 +19,6 @@
 #include "../base_media_base.h"
 #include "../core/mem_func.hpp"
 #include <mutex>
-#if defined(__MINGW32__)
-#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
-#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
-#endif
 
 #include "../safeguards.h"
 

src/network/core/os_abstraction.cpp

@@ -20,9 +20,6 @@
 #include "os_abstraction.h"
 #include "../../string_func.h"
 #include <mutex>
-#if defined(__MINGW32__)
-#include "../../3rdparty/mingw-std-threads/mingw.mutex.h"
-#endif
 
 #include "../../safeguards.h"
 

src/network/core/tcp.h

@@ -22,9 +22,6 @@
 #include <memory>
 #include <vector>
 #include <thread>
-#if defined(__MINGW32__)
-#include "3rdparty/mingw-std-threads/mingw.thread.h"
-#endif
 
 /** The states of sending the packets. */
 enum SendPacketsState {

src/network/network_server.cpp

@@ -34,10 +34,6 @@
 #include "../3rdparty/monocypher/monocypher.h"
 #include <mutex>
 #include <condition_variable>
-#if defined(__MINGW32__)
-#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
-#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
-#endif
 
 #include "../safeguards.h"
 

src/network/network_survey.h

@@ -12,10 +12,6 @@
 
 #include <condition_variable>
 #include <mutex>
-#if defined(__MINGW32__)
-#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
-#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
-#endif
 #include "core/http.h"
 
 /**

src/newgrf_config.cpp

@@ -30,10 +30,6 @@
 #include "thread.h"
 #include <mutex>
 #include <condition_variable>
-#if defined(__MINGW32__)
-#include "3rdparty/mingw-std-threads/mingw.mutex.h"
-#include "3rdparty/mingw-std-threads/mingw.condition_variable.h"
-#endif
 
 #include "safeguards.h"
 

src/openttd.cpp

@@ -101,9 +101,6 @@
 
 #include <atomic>
 #include <mutex>
-#if defined(__MINGW32__)
-#include "3rdparty/mingw-std-threads/mingw.mutex.h"
-#endif
 
 #include <stdarg.h>
 #include <system_error>

src/os/windows/survey_win.cpp

@@ -15,10 +15,6 @@
 #include <thread>
 #include <windows.h>
 
-#if defined(__MINGW32__)
-#include "../../3rdparty/mingw-std-threads/mingw.thread.h"
-#endif
-
 #include "../../safeguards.h"
 
 extern std::string SurveyMemoryToText(uint64_t memory);

src/os/windows/win32.cpp

@@ -34,10 +34,6 @@
 #include <array>
 #include <map>
 #include <mutex>
-#if defined(__MINGW32__)
-#include "../../3rdparty/mingw-std-threads/mingw.mutex.h"
-#endif
-
 
 #include "../../safeguards.h"
 

src/sl/saveload.cpp

@@ -66,10 +66,6 @@
 #include "../thread.h"
 #include <mutex>
 #include <condition_variable>
-#if defined(__MINGW32__)
-#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
-#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
-#endif
 
 #include "../safeguards.h"
 

src/thread.h

@@ -15,10 +15,6 @@
 #include <system_error>
 #include <thread>
 #include <mutex>
-#if defined(__MINGW32__)
-#include "3rdparty/mingw-std-threads/mingw.thread.h"
-#include "3rdparty/mingw-std-threads/mingw.mutex.h"
-#endif
 
 /**
  * Sleep on the current thread for a defined time.

src/video/sdl2_default_v.cpp

@@ -26,10 +26,6 @@
 #include <SDL.h>
 #include <mutex>
 #include <condition_variable>
-#if defined(__MINGW32__)
-#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
-#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
-#endif
 #ifdef __EMSCRIPTEN__
 #	include <emscripten.h>
 #	include <emscripten/html5.h>

src/video/sdl2_opengl_v.cpp

@@ -30,10 +30,6 @@
 #include <SDL.h>
 #include <mutex>
 #include <condition_variable>
-#if defined(__MINGW32__)
-#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
-#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
-#endif
 #include <GL/gl.h>
 #include "../3rdparty/opengl/glext.h"
 #include "opengl.h"

src/video/sdl2_v.h

@@ -11,9 +11,6 @@
 #define VIDEO_SDL_H
 
 #include <condition_variable>
-#if defined(__MINGW32__)
-#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
-#endif
 
 #include "video_driver.hpp"
 #include <vector>

src/video/video_driver.hpp

@@ -23,11 +23,6 @@
 #include <thread>
 #include <vector>
 #include <functional>
-#if defined(__MINGW32__)
-#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
-#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
-#include "../3rdparty/mingw-std-threads/mingw.thread.h"
-#endif
 
 extern std::string _ini_videodriver;
 extern std::vector<Dimension> _resolutions;

src/video/win32_v.h

@@ -13,10 +13,6 @@
 #include "video_driver.hpp"
 #include <mutex>
 #include <condition_variable>
-#if defined(__MINGW32__)
-#include "../3rdparty/mingw-std-threads/mingw.mutex.h"
-#include "../3rdparty/mingw-std-threads/mingw.condition_variable.h"
-#endif
 #include <vector>
 
 /** Base class for Windows video drivers. */

src/viewport.cpp

@@ -125,10 +125,6 @@
 
 #include <mutex>
 #include <condition_variable>
-#if defined(__MINGW32__)
-#include "3rdparty/mingw-std-threads/mingw.mutex.h"
-#include "3rdparty/mingw-std-threads/mingw.condition_variable.h"
-#endif
 
 #include "table/strings.h"
 #include "table/string_colours.h"

src/worker_thread.h

@@ -13,10 +13,6 @@
 #include "core/ring_buffer_queue.hpp"
 #include <mutex>
 #include <condition_variable>
-#if defined(__MINGW32__)
-#include "3rdparty/mingw-std-threads/mingw.mutex.h"
-#include "3rdparty/mingw-std-threads/mingw.condition_variable.h"
-#endif
 
 typedef void WorkerJobFunc(void *, void *, void *);