trying to make that build work

Author: zardoru

CMakeLists.txt

@@ -72,19 +72,12 @@ endif ()
 
 if (WIN32)
     set(CC_LINK_LIBS ${CC_LINK_LIBS} Wininet Winmm)
-endif ()
-
-if (UNIX AND VRX_USE_MULTITHREAD)
-    find_package(Threads)
-    set(CC_LINK_LIBS ${CC_LINK_LIBS} ${CMAKE_THREAD_LIBS_INIT})
-endif ()
 
-if (WIN32 AND VRX_USE_MULTITHREAD)
     if (MSVC)
         FetchContent_Declare(
-            pthreads
-            GIT_REPOSITORY https://github.com/GerHobbelt/pthread-win32
-            GIT_TAG master
+                pthreads
+                GIT_REPOSITORY https://github.com/GerHobbelt/pthread-win32
+                GIT_TAG master
         )
 
         FetchContent_MakeAvailable(pthreads)
@@ -96,6 +89,11 @@ if (WIN32 AND VRX_USE_MULTITHREAD)
     endif ()
 endif ()
 
+if (UNIX)
+    find_package(Threads)
+    set(CC_LINK_LIBS ${CC_LINK_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+endif ()
+
 if (VRX_REMOVERESPAWNS)
     add_definitions(-DREMOVE_RESPAWNS)
 endif ()

src/characters/io/gds.h

@@ -38,13 +38,11 @@ qboolean gds_enabled();
 void gds_finish_thread();
 void gds_handle_status(edict_t *player);
 
-void Mem_PrepareMutexes();
-
 qboolean vrx_mysql_isloading(edict_t *ent);
 qboolean vrx_mysql_saveclose_character(edict_t* player);
 
 #endif //NO_GDS
 
-
+void Mem_PrepareMutexes();
 
 #endif // MYSQL_GDS

src/characters/io/v_mysql_gds.c

@@ -1,13 +1,22 @@
 #include "g_local.h"
 #include "v_characterio.h"
+
+#include <pthread.h>
+
+// Threading
+static pthread_t QueueThread;
+static pthread_attr_t attr;
+static pthread_mutex_t mutex_gds_queue;
+static pthread_mutex_t MemMutex_Free;
+static pthread_mutex_t MemMutex_Malloc;
+static pthread_mutex_t mutex_gds_thread_status;
+
 #ifndef NO_GDS
 
 #include <mysql.h>
 #include "gds.h"
 #include "characters/class_limits.h"
 
-#include <pthread.h>
-
 #ifdef _WIN32
 #pragma warning ( disable : 4090 ; disable : 4996 )
 #endif
@@ -86,14 +95,6 @@ static gds_queue_t *last = NULL;
 static cvar_t *gds_singleserver;
 static cvar_t *gds_serverkey;
 
-// Threading
-static pthread_t QueueThread;
-static pthread_attr_t attr;
-static pthread_mutex_t mutex_gds_queue;
-static pthread_mutex_t MemMutex_Free;
-static pthread_mutex_t MemMutex_Malloc;
-static pthread_mutex_t mutex_gds_thread_status;
-
 static qboolean ThreadRunning;
 
 // Prototypes
@@ -1931,11 +1932,6 @@ qboolean gds_connect() {
     return true;
 }
 
-void Mem_PrepareMutexes() {
-    pthread_mutex_init(&MemMutex_Malloc, NULL);
-    pthread_mutex_init(&MemMutex_Free, NULL);
-}
-
 qboolean gds_enabled() {
     return GDS_MySQL != NULL;
 }
@@ -1979,6 +1975,11 @@ void gds_finish_thread() {
 
 #endif // NO_GDS
 
+void Mem_PrepareMutexes() {
+    pthread_mutex_init(&MemMutex_Malloc, NULL);
+    pthread_mutex_init(&MemMutex_Free, NULL);
+}
+
 void *vrx_malloc(size_t Size, int Tag) {
     void *Memory;
     pthread_mutex_lock(&MemMutex_Malloc);

src/menus/menu.h

@@ -16,7 +16,7 @@
 #define MENU_MULTI_UPGRADE		3
 #define MENU_COMBAT_PREFERENCES	4
 
-void menu_add_line (edict_t *ent,char *line,int option);
+void menu_add_line (edict_t *ent, const char *line,int option);
 void menu_clear (edict_t *ent);
 void menu_set_handler (edict_t *ent,void (*optionselected)(edict_t *ent,int option));
 void menu_set_close_handler(edict_t* ent, void (*onclose)(edict_t* ent));

src/q_shared.h

@@ -26,7 +26,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
-
+#include <limits.h>
 #endif
 //K03 End
 

src/server/defer.c

@@ -15,7 +15,7 @@ void defer_global_init()
 	pthread_mutexattr_t attr;
 	pthread_mutexattr_init(&attr);
 
-	pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
+	pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_RECURSIVE);
 
 	pthread_mutex_init(&defer_mutex, &attr);