Remove mingw-std-threads from 3rd party deps

and use native libs/headers instead
LMMS · May 29, 2024 · 97c7b8c · 97c7b8c
1 parent 5f8b7a7
commit 97c7b8c
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 47 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -25,9 +25,6 @@
 [submodule "src/3rdparty/weakjack/weakjack"]
 	path = src/3rdparty/weakjack/weakjack
 	url = https://github.com/x42/weakjack.git
-[submodule "src/3rdparty/mingw-std-threads"]
-	path = src/3rdparty/mingw-std-threads
-	url = https://github.com/meganz/mingw-std-threads.git
 [submodule "doc/wiki"]
 	path = doc/wiki
 	url = https://github.com/lmms/lmms.wiki.git

diff --git a/include/AudioEngine.h b/include/AudioEngine.h
@@ -25,11 +25,7 @@
 #ifndef LMMS_AUDIO_ENGINE_H
 #define LMMS_AUDIO_ENGINE_H
 
-#ifdef __MINGW32__
-#include <mingw.mutex.h>
-#else
 #include <mutex>
-#endif
 
 #include <QThread>
 #include <samplerate.h>

diff --git a/include/FileBrowserSearcher.h b/include/FileBrowserSearcher.h
@@ -31,15 +31,9 @@
 #include <optional>
 #include <queue>
 
-#ifdef __MINGW32__
-#include <mingw.condition_variable.h>
-#include <mingw.mutex.h>
-#include <mingw.thread.h>
-#else
 #include <condition_variable>
 #include <mutex>
 #include <thread>
-#endif
 
 namespace lmms::gui {
 

diff --git a/plugins/VstBase/RemoteVstPlugin.cpp b/plugins/VstBase/RemoteVstPlugin.cpp
@@ -87,11 +87,7 @@
 #undef Unsorted
 #endif
 
-#ifdef USE_MINGW_THREADS_REPLACEMENT
-#	include <mingw.mutex.h>
-#else
-#	include <mutex>
-#endif
+#include <mutex>
 
 #include <algorithm>
 #include <vector>

diff --git a/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt b/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt
@@ -69,21 +69,6 @@ endif()
 
 if(IS_MINGW)
 	SET(CMAKE_REQUIRED_FLAGS "-std=c++17")
-
-	CHECK_CXX_SOURCE_COMPILES("
-	#include <mutex>
-	int main(int argc, const char* argv[]) {
-		std::mutex m;
-		return 0;
-	}
-	" HAS_STD_MUTEX)
-
-	if(NOT HAS_STD_MUTEX)
-		target_include_directories(${EXE_NAME} PRIVATE
-			"${LMMS_SOURCE_DIR}/src/3rdparty/mingw-std-threads")
-		target_compile_definitions(${EXE_NAME} PRIVATE
-			-DUSE_MINGW_THREADS_REPLACEMENT)
-	endif()
 endif()
 
 if(LMMS_BUILD_WIN32)

diff --git a/plugins/ZynAddSubFx/CMakeLists.txt b/plugins/ZynAddSubFx/CMakeLists.txt
@@ -50,7 +50,6 @@ include_directories(
 	${FFTW3F_INCLUDE_DIRS}
 	"${CMAKE_CURRENT_BINARY_DIR}"
 	"${CMAKE_BINARY_DIR}"
-	"${CMAKE_SOURCE_DIR}/src/3rdparty/mingw-std-threads"
 	"${CMAKE_CURRENT_SOURCE_DIR}/zynaddsubfx/src/UI"
 )
 

diff --git a/plugins/ZynAddSubFx/ThreadShims.h b/plugins/ZynAddSubFx/ThreadShims.h
@@ -1,9 +1,3 @@
 #include <condition_variable>
 #include <mutex>
 #include <thread>
-
-#if defined(__MINGW32__) && !defined(_GLIBCXX_HAS_GTHREADS)
-#	include <mingw.condition_variable.h>
-#	include <mingw.mutex.h>
-#	include <mingw.thread.h>
-#endif
diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt
@@ -6,12 +6,6 @@ ENDIF()
 ADD_SUBDIRECTORY(hiir)
 ADD_SUBDIRECTORY(weakjack)
 
-if(MINGW)
-	option(MINGW_STDTHREADS_GENERATE_STDHEADERS "" ON)
-	add_subdirectory(mingw-std-threads)
-	set(LMMS_USE_MINGW_STD_THREADS ON PARENT_SCOPE)
-endif()
-
 # The lockless ring buffer library is compiled as part of the core
 SET(RINGBUFFER_DIR "${CMAKE_SOURCE_DIR}/src/3rdparty/ringbuffer/")
 SET(RINGBUFFER_DIR ${RINGBUFFER_DIR} PARENT_SCOPE)

diff --git a/src/3rdparty/mingw-std-threads b/src/3rdparty/mingw-std-threads