From 1b6a1506242253e74686e3741e280b727324bc8e Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Wed, 24 Sep 2025 20:48:50 +0200
Subject: [PATCH] build: Move jthread library to libwolv

---
 .gitmodules                                  |  6 +-----
 cmake/build_helpers.cmake                    | 12 ------------
 lib/external/libwolv                         |  2 +-
 lib/third_party/jthread/CMakeLists.txt       |  6 ------
 lib/third_party/jthread/includes/jthread.hpp | 11 -----------
 lib/third_party/jthread/jthread              |  1 -
 6 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 lib/third_party/jthread/CMakeLists.txt
 delete mode 100644 lib/third_party/jthread/includes/jthread.hpp
 delete mode 160000 lib/third_party/jthread/jthread

diff --git a/.gitmodules b/.gitmodules
index 08f23d7f0..1564185e7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,10 +18,6 @@
 	path = lib/third_party/capstone
 	url = https://github.com/capstone-engine/capstone
 	ignore = dirty
-[submodule "lib/third_party/jthread/jthread"]
-	path = lib/third_party/jthread/jthread
-    url = https://github.com/josuttis/jthread
-    ignore = dirty
 [submodule "lib/third_party/edlib"]
 	path = lib/third_party/edlib
 	url = https://github.com/Martinsos/edlib
@@ -49,4 +45,4 @@
 	url = https://github.com/WerWolv/Disassembler
 [submodule "lib/third_party/md4c"]
 	path = lib/third_party/md4c
-	url = https://github.com/mity/md4c
+	url = https://github.com/mity/md4c
\ No newline at end of file
diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
index 041a238c6..c8f0cc5b9 100644
--- a/cmake/build_helpers.cmake
+++ b/cmake/build_helpers.cmake
@@ -889,18 +889,6 @@ macro(addBundledLibraries)
         find_package(LLVM REQUIRED Demangle)
     endif()
 
-    if (NOT USE_SYSTEM_JTHREAD)
-        add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/jthread EXCLUDE_FROM_ALL)
-        set(JTHREAD_LIBRARIES jthread)
-    else()
-        find_path(JOSUTTIS_JTHREAD_INCLUDE_DIRS "condition_variable_any2.hpp")
-        include_directories(${JOSUTTIS_JTHREAD_INCLUDE_DIRS})
-
-        add_library(jthread INTERFACE)
-        target_include_directories(jthread INTERFACE ${JOSUTTIS_JTHREAD_INCLUDE_DIRS})
-        set(JTHREAD_LIBRARIES jthread)
-    endif()
-
     if (USE_SYSTEM_BOOST)
         find_package(Boost REQUIRED CONFIG COMPONENTS regex)
         set(BOOST_LIBRARIES Boost::regex)
diff --git a/lib/external/libwolv b/lib/external/libwolv
index 577213efe..fb7096d5a 160000
--- a/lib/external/libwolv
+++ b/lib/external/libwolv
@@ -1 +1 @@
-Subproject commit 577213efe6f8f5ee63ce3bb9c9d06508a058fb3e
+Subproject commit fb7096d5aed18567a6349ed5a8213e7f7530d7f6
diff --git a/lib/third_party/jthread/CMakeLists.txt b/lib/third_party/jthread/CMakeLists.txt
deleted file mode 100644
index c4e9082d5..000000000
--- a/lib/third_party/jthread/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 3.16)
-
-project(jthread)
-
-add_library(jthread INTERFACE)
-target_include_directories(jthread INTERFACE includes)
\ No newline at end of file
diff --git a/lib/third_party/jthread/includes/jthread.hpp b/lib/third_party/jthread/includes/jthread.hpp
deleted file mode 100644
index 522897a75..000000000
--- a/lib/third_party/jthread/includes/jthread.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#if __cpp_lib_jthread >= 201911L
-    #include <thread>
-#else
-    #define __stop_callback_base __stop_callback_base_j
-    #define __stop_state __stop_state_j
-    #include "../jthread/source/jthread.hpp"
-    #undef __stop_callback_base
-    #undef __stop_state
-#endif
\ No newline at end of file
diff --git a/lib/third_party/jthread/jthread b/lib/third_party/jthread/jthread
deleted file mode 160000
index 0fa8d3942..000000000
--- a/lib/third_party/jthread/jthread
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0fa8d394254886c555d6faccd0a3de819b7d47f8