Displace threading into core (qfortress graft)

10 files changed, 17 insertions, 15 deletions

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index edcab85..16cc4f0 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -6,12 +6,14 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/version.cc.in" "${CMAKE_CURRENT_LIST_D
 
 add_library(core STATIC
     "${CMAKE_CURRENT_LIST_DIR}/pch.hh"
+    "${CMAKE_CURRENT_LIST_DIR}/threading.cc"
+    "${CMAKE_CURRENT_LIST_DIR}/threading.hh"
     "${CMAKE_CURRENT_LIST_DIR}/version.cc"
     "${CMAKE_CURRENT_LIST_DIR}/version.hh")
 target_compile_features(core PUBLIC cxx_std_20)
 target_include_directories(core PUBLIC "${PROJECT_SOURCE_DIR}")
 target_precompile_headers(core PRIVATE "${CMAKE_CURRENT_LIST_DIR}/pch.hh")
-target_link_libraries(core PUBLIC enet emhash glm physfs spdlog stb)
+target_link_libraries(core PUBLIC enet emhash glm physfs spdlog stb thread_pool)
 
 add_subdirectory(config)
 add_subdirectory(io)
diff --git a/core/pch.hh b/core/pch.hh
index 924b1dd..3a013bd 100644
--- a/core/pch.hh
+++ b/core/pch.hh
@@ -25,6 +25,8 @@
 #include <unordered_set>
 #include <vector>
 
+#include <BS_thread_pool.hpp>
+
 #include <emhash/hash_table8.hpp>
 
 #include <enet/enet.h>
diff --git a/game/shared/threading.cc b/core/threading.cc
index 209bd3c..4c7f8c8 100644
--- a/game/shared/threading.cc
+++ b/core/threading.cc
@@ -1,6 +1,6 @@
-#include "shared/pch.hh"
+#include "core/pch.hh"
 
-#include "shared/threading.hh"
+#include "core/threading.hh"
 
 #include "core/io/cmdline.hh"
 #include "core/math/constexpr.hh"
diff --git a/game/shared/threading.hh b/core/threading.hh
index 02903d5..bd359ad 100644
--- a/game/shared/threading.hh
+++ b/core/threading.hh
@@ -1,5 +1,5 @@
-#ifndef SHARED_THREADING_HH
-#define SHARED_THREADING_HH 1
+#ifndef CORE_THREADING_HH
+#define CORE_THREADING_HH 1
 #pragma once
 
 enum class task_status : unsigned int {
@@ -47,4 +47,4 @@ inline void threading::submit(AT&&... args)
     threading::detail::submit_new(new T(args...));
 }
 
-#endif // SHARED_THREADING_HH
+#endif // CORE_THREADING_HH
diff --git a/game/client/main.cc b/game/client/main.cc
index 06a0da2..51d4670 100644
--- a/game/client/main.cc
+++ b/game/client/main.cc
@@ -7,11 +7,11 @@
 #include "core/resource/resource.hh"
 #include "core/utils/epoch.hh"
 
+#include "core/threading.hh"
 #include "core/version.hh"
 
 #include "shared/game.hh"
 #include "shared/splash.hh"
-#include "shared/threading.hh"
 
 #include "client/gui/window_title.hh"
 #include "client/io/glfw.hh"
diff --git a/game/client/world/chunk_mesher.cc b/game/client/world/chunk_mesher.cc
index 9f5ce6c..53c4882 100644
--- a/game/client/world/chunk_mesher.cc
+++ b/game/client/world/chunk_mesher.cc
@@ -4,12 +4,13 @@
 
 #include "core/math/crc64.hh"
 
+#include "core/threading.hh"
+
 #include "shared/world/chunk.hh"
 #include "shared/world/dimension.hh"
 #include "shared/world/voxel_registry.hh"
 
 #include "shared/coord.hh"
-#include "shared/threading.hh"
 
 #include "client/world/chunk_quad.hh"
 #include "client/world/voxel_atlas.hh"
diff --git a/game/server/main.cc b/game/server/main.cc
index deb0f97..872307b 100644
--- a/game/server/main.cc
+++ b/game/server/main.cc
@@ -9,11 +9,11 @@
 #include "core/resource/resource.hh"
 #include "core/utils/epoch.hh"
 
+#include "core/threading.hh"
 #include "core/version.hh"
 
 #include "shared/game.hh"
 #include "shared/protocol.hh"
-#include "shared/threading.hh"
 
 #include "server/game.hh"
 #include "server/globals.hh"
diff --git a/game/server/world/worldgen.cc b/game/server/world/worldgen.cc
index 99e9a78..8b02b52 100644
--- a/game/server/world/worldgen.cc
+++ b/game/server/world/worldgen.cc
@@ -4,11 +4,12 @@
 
 #include "core/io/cmdline.hh"
 
+#include "core/threading.hh"
+
 #include "shared/world/chunk.hh"
 #include "shared/world/dimension.hh"
 
 #include "shared/protocol.hh"
-#include "shared/threading.hh"
 
 #include "server/world/inhabited.hh"
 
diff --git a/game/shared/CMakeLists.txt b/game/shared/CMakeLists.txt
index 8a6fb57..d4cb6d8 100644
--- a/game/shared/CMakeLists.txt
+++ b/game/shared/CMakeLists.txt
@@ -14,14 +14,12 @@ add_library(shared STATIC
     "${CMAKE_CURRENT_LIST_DIR}/protocol.hh"
     "${CMAKE_CURRENT_LIST_DIR}/splash.cc"
     "${CMAKE_CURRENT_LIST_DIR}/splash.hh"
-    "${CMAKE_CURRENT_LIST_DIR}/threading.cc"
-    "${CMAKE_CURRENT_LIST_DIR}/threading.hh"
     "${CMAKE_CURRENT_LIST_DIR}/types.hh")
 target_compile_features(shared PUBLIC cxx_std_20)
 target_include_directories(shared PRIVATE "${PROJECT_SOURCE_DIR}")
 target_include_directories(shared PRIVATE "${PROJECT_SOURCE_DIR}/game")
 target_precompile_headers(shared PRIVATE "${CMAKE_CURRENT_LIST_DIR}/pch.hh")
-target_link_libraries(shared PUBLIC core enet entt FNL miniz parson thread_pool)
+target_link_libraries(shared PUBLIC core enet entt FNL miniz parson)
 
 add_subdirectory(entity)
 add_subdirectory(world)
diff --git a/game/shared/pch.hh b/game/shared/pch.hh
index d3c09d7..95ee6d0 100644
--- a/game/shared/pch.hh
+++ b/game/shared/pch.hh
@@ -6,8 +6,6 @@
 
 #include <csignal>
 
-#include <BS_thread_pool.hpp>
-
 #include <enet/enet.h>
 
 #include <entt/entity/registry.hpp>