Merge branch 'master' into amir/capi

Author: AmyrAhmady

Server/Components/CMakeLists.txt

@@ -21,6 +21,7 @@ add_subdirectory(TextLabels)
 add_subdirectory(Timers)
 add_subdirectory(Variables)
 add_subdirectory(Vehicles)
+add_subdirectory(NPCs)
 
 # Pawn
 if(BUILD_PAWN_COMPONENT)

Server/Components/Console/console_impl.hpp

@@ -65,6 +65,7 @@ class ConsoleComponent final : public IConsoleComponent, public CoreEventHandler
 	String cmd;
 	ThreadProcData* threadData;
 	std::thread cinThread;
+	std::thread::native_handle_type nativeThreadHandle;
 
 	struct PlayerRconCommandHandler : public SingleNetworkInEventHandler
 	{
@@ -212,7 +213,11 @@ class ConsoleComponent final : public IConsoleComponent, public CoreEventHandler
 
 		threadData = new ThreadProcData { true, this };
 		cinThread = std::thread(ThreadProc, threadData);
+		nativeThreadHandle = cinThread.native_handle();
+
+#ifndef WIN32
 		cinThread.detach();
+#endif
 	}
 
 	void onReady() override
@@ -257,10 +262,16 @@ class ConsoleComponent final : public IConsoleComponent, public CoreEventHandler
 		if (threadData)
 		{
 			threadData->valid = false;
+
+#ifdef WIN32
 			if (cinThread.joinable())
 			{
 				cinThread.join();
 			}
+#else
+			pthread_cancel(nativeThreadHandle);
+#endif
+
 			delete threadData;
 			threadData = nullptr;
 		}

Server/Components/NPCs/CMakeLists.txt

@@ -0,0 +1,7 @@
+get_filename_component(ProjectId ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+include_directories(${CMAKE_SOURCE_DIR}/lib/cpp-httplib)
+add_server_component(${ProjectId})
+
+target_link_libraries(${ProjectId} PRIVATE
+    CONAN_PKG::ghc-filesystem
+)