Merge branch 'cmake-15-fixes' into 'master'

Various fixes for 1.6

Closes #17, #15, and #11

See merge request !292

assets/CMakeLists.txt

@@ -14,7 +14,6 @@ set(SRB2_ASSET_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/installer"
 
 set(SRB2_ASSET_HASHED
 "srb2.srb;\
-patch.kart;\
 gfx.kart;\
 textures.kart;\
 chars.kart;\

src/config.h.in

@@ -23,7 +23,7 @@
 #define ASSET_HASH_CHARS_KART    "${SRB2_ASSET_chars.kart_HASH}"
 #define ASSET_HASH_MAPS_KART     "${SRB2_ASSET_maps.kart_HASH}"
 #ifdef USE_PATCH_KART
-#define ASSET_HASH_PATCH_KART    "${SRB2_ASSET_patch.kart_HASH}"
+#define ASSET_HASH_PATCH_KART    "00000000000000000000000000000000"
 #endif
 
 #define SRB2_COMP_REVISION       "${SRB2_COMP_REVISION}"

src/mserv.c

@@ -591,5 +591,8 @@ Advertise_OnChange(void)
 	DRPC_UpdatePresence();
 #endif
 
-	M_PopupMasterServerRules();
+	if (!dedicated)
+	{
+		M_PopupMasterServerRules();
+	}
 }

src/sdl/CMakeLists.txt

@@ -36,6 +36,7 @@ set(SRB2_SDL2_SOURCES
 	i_system.c
 	i_ttf.c
 	i_video.c
+	i_threads.c
 	#IMG_xpm.c
 	ogl_sdl.c
 
@@ -261,6 +262,7 @@ if(${SDL2_FOUND})
 
 	target_compile_definitions(SRB2SDL2 PRIVATE
 		-DHAVE_SDL
+		-DHAVE_THREADS
 	)
 
 	## strip debug symbols into separate file when using gcc