dummy change

Makefile

@@ -214,6 +214,7 @@ RVDIR=$(MOUNT_DIR)/renderervk
 SDLDIR=$(MOUNT_DIR)/sdl
 SDLHDIR=$(MOUNT_DIR)/libsdl/include/SDL2
 
+RSDIR=$(MOUNT_DIR)/recordsystem
 CMDIR=$(MOUNT_DIR)/qcommon
 UDIR=$(MOUNT_DIR)/unix
 W32DIR=$(MOUNT_DIR)/win32
@@ -438,6 +439,8 @@ ifdef MINGW
   LDFLAGS += -Wl,--gc-sections -fvisibility=hidden
   LDFLAGS += -lwsock32 -lgdi32 -lwinmm -lole32 -lws2_32 -lpsapi -lcomctl32
   LDFLAGS += -flto
+  LDFLAGS += -lpthread
+
 
   CLIENT_LDFLAGS=$(LDFLAGS)
 
@@ -707,7 +710,7 @@ endef
 
 define DO_DED_CC
 $(echo_cmd) "DED_CC $<"
-$(Q)$(CC) $(CFLAGS) -DDEDICATED -o $@ -c $<
+$(Q)$(CC) $(CFLAGS) -DDEDICATED -DENABLE_RS -o $@ -c $<
 endef
 
 define DO_WINDRES
@@ -1305,6 +1308,11 @@ Q3DOBJ = \
   $(B)/ded/cm_test.o \
   $(B)/ded/cm_trace.o \
   $(B)/ded/cmd.o \
+  $(B)/ded/cJSON.o \
+  $(B)/ded/rs_records.o \
+  $(B)/ded/rs_common.o \
+  $(B)/ded/rs_commands.o \
+  $(B)/ded/rs_serverdemos.o \
   $(B)/ded/common.o \
   $(B)/ded/cvar.o \
   $(B)/ded/files.o \
@@ -1384,7 +1392,7 @@ endif
 
 $(B)/$(TARGET_SERVER): $(Q3DOBJ)
 	$(echo_cmd) "LD $@"
-	$(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS)
+	$(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) -lcurl -lpthread
 
 #############################################################################
 ## CLIENT/SERVER RULES
@@ -1399,6 +1407,9 @@ $(B)/client/%.o: $(CDIR)/%.c
 $(B)/client/%.o: $(SDIR)/%.c
 	$(DO_CC)
 
+$(B)/client/%.o: $(RSDIR)/%.c
+	$(DO_CC)
+
 $(B)/client/%.o: $(CMDIR)/%.c
 	$(DO_CC)
 
@@ -1465,6 +1476,9 @@ $(B)/ded/%.o: $(ADIR)/%.s
 $(B)/ded/%.o: $(SDIR)/%.c
 	$(DO_DED_CC)
 
+$(B)/ded/%.o: $(RSDIR)/%.c
+	$(DO_DED_CC)
+
 $(B)/ded/%.o: $(CMDIR)/%.c
 	$(DO_DED_CC)
 

code/qcommon/files.c

@@ -306,6 +306,7 @@ static  cvar_t          *fs_apppath;
 static	cvar_t		*fs_steampath;
 
 static	cvar_t		*fs_basepath;
+static	cvar_t		*fs_include; // Cyberstorm - Optional extra path.
 static	cvar_t		*fs_basegame;
 static	cvar_t		*fs_copyfiles;
 static	cvar_t		*fs_gamedirvar;
@@ -2520,7 +2521,6 @@ static void FS_WriteCacheHeader( FILE *f )
 	fwrite( cache_header, sizeof( cache_header ), 1, f );
 }
 
-
 static qboolean FS_ValidateCacheHeader( FILE *f )
 {
 	byte buf[ sizeof(cache_header) ];
@@ -4103,6 +4103,44 @@ static void FS_Which_f( void ) {
 	}
 }
 
+static void FS_AddMapDirectory( const char *path, const char *dir ) {
+ 	const searchpath_t *sp;
+ 	int				len;
+ 	searchpath_t	*search;
+ 	int				path_len;
+ 	int				dir_len;
+
+ 	for ( sp = fs_searchpaths ; sp ; sp = sp->next ) {
+ 		if ( sp->dir && !Q_stricmp( sp->dir->path, path ) && !Q_stricmp( sp->dir->gamedir, dir )) {
+ 			return;	// we've already got this one
+ 		}
+ 	}
+
+ 	Q_strncpyz( fs_gamedir, dir, sizeof( fs_gamedir ) );
+
+ 	//
+ 	// add the directory to the search path
+ 	//
+ 	path_len = (int) strlen( path ) + 1;
+ 	path_len = PAD( path_len, sizeof( int ) );
+ 	dir_len = (int) strlen( dir ) + 1;
+ 	dir_len = PAD( dir_len, sizeof( int ) );
+ 	len = sizeof( *search ) + sizeof( *search->dir ) + path_len + dir_len;
+
+ 	search = Z_TagMalloc( len, TAG_SEARCH_PATH );
+ 	Com_Memset( search, 0, len );
+ 	search->dir = (directory_t*)( search + 1 );
+ 	search->dir->path = (char*)( search->dir + 1 );
+ 	search->dir->gamedir = (char*)( search->dir->path + path_len );
+
+ 	strcpy( search->dir->path, path );
+ 	strcpy( search->dir->gamedir, dir );
+
+ 	search->next = fs_searchpaths;
+ 	fs_searchpaths = search;
+ 	fs_dirCount++;
+}
+
 
 //===========================================================================
 
@@ -4692,6 +4730,8 @@ static void FS_Startup( void ) {
 	Cvar_SetDescription( fs_copyfiles, "Whether or not to copy files when loading them into the game. Every file found in the cdpath will be copied over." );
 	fs_basepath = Cvar_Get( "fs_basepath", Sys_DefaultBasePath(), CVAR_INIT | CVAR_PROTECTED | CVAR_PRIVATE );
 	Cvar_SetDescription( fs_basepath, "Write-protected CVAR specifying the path to the installation folder of the game." );
+	fs_include = Cvar_Get("fs_include", "", CVAR_INIT); // Cyberstorm
+	Cvar_SetDescription( fs_include, "Write-protected CVAR specifying additional paths to look for maps." );
 	fs_basegame = Cvar_Get( "fs_basegame", BASEGAME, CVAR_INIT | CVAR_PROTECTED );
 	Cvar_SetDescription( fs_basegame, "Write-protected CVAR specifying the path to the base game(s) folder(s), separated by '/'." );
 	fs_steampath = Cvar_Get( "fs_steampath", "", CVAR_INIT | CVAR_PROTECTED | CVAR_PRIVATE );
@@ -4776,6 +4816,13 @@ static void FS_Startup( void ) {
 	}
 #endif
 
+	// Cyberstorm
+	if (fs_include->string[0]) {
+		Com_Printf( "----- NFS -----\n" );
+		FS_AddMapDirectory(fs_basepath->string, fs_include->string);
+	}
+	// !Cyberstorm
+
 	// fs_homepath is somewhat particular to *nix systems, only add if relevant
 	// NOTE: same filtering below for mods and basegame
 	if ( fs_homepath->string[0] && Q_stricmp( fs_homepath->string, fs_basepath->string ) ) {