stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-13 13:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Various fixes for 1.6

Closes #17, #15, and #11

See merge request KartKrew/Kart-Public!292
This commit is contained in:
Sal 2022-08-20 17:26:02 +00:00
commit a37ae53ff7
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assets/CMakeLists.txt
View file

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

2
src/config.h.in
View file

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

5
src/mserv.c
View file

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

2
src/sdl/CMakeLists.txt
View file

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