Bump submodule and generate std headers

sakertooth · Aug 20, 2023 · f69b471 · f69b471
1 parent 793f096
commit f69b471
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt
@@ -7,6 +7,14 @@ ADD_SUBDIRECTORY(hiir)
 ADD_SUBDIRECTORY(rpmalloc)
 ADD_SUBDIRECTORY(weakjack)
 
+INCLUDE(CheckCXXPreprocessor)
+CHECK_CXX_DEFINE(IS_MINGW "__MINGW32__")
+IF(IS_MINGW)
+	OPTION(MINGW_STDTHREADS_GENERATE_STDHEADERS "" ON)
+	ADD_SUBDIRECTORY(mingw-std-threads)
+	set(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/CMakeLists.txt b/src/CMakeLists.txt
@@ -207,6 +207,10 @@ FOREACH(LIB ${LMMS_REQUIRED_LIBS})
 	ENDIF()
 ENDFOREACH()
 
+IF(USE_MINGW_STD_THREADS)
+	TARGET_LINK_LIBRARIES(lmmsobjs PRIVATE mingw_stdthreads)
+ENDIF()
+
 IF(LMMS_BUILD_WIN32)
 	SET_TARGET_PROPERTIES(lmms PROPERTIES
 		ENABLE_EXPORTS ON