Merge branch 'jgrpp' into jgrpp-beta

# Conflicts: # src/network/core/packet.cpp # src/network/core/udp.cpp
2021-10-29 22:22:54 +01:00
parent 24c6dfe872 e34cc229d1
commit 61cc60099a
45 changed files with 382 additions and 107 deletions
--- a/src/os/unix/unix.cpp
+++ b/src/os/unix/unix.cpp
@@ -337,8 +337,10 @@ int GetCurrentThreadName(char *str, const char *last)
 	return 0;
 }

+#if !defined(NO_THREADS)
 static pthread_t main_thread;
 static pthread_t game_thread;
+#endif

 void SetSelfAsMainThread()
 {