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

Fix cmake using wrong libs if internal libs is turned on

Browse source 
Use '\0' instead, just in case
This commit is contained in:
Steel Titanium 2020-04-12 17:56:12 -04:00
parent 2dd7854a9b
commit 9293c6cb32
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/CMakeLists.txt
View file

@ -398,9 +398,9 @@ if(${SRB2_CONFIG_HAVE_CURL})
set(CURL_FOUND ON) set(CURL_FOUND ON)
set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl) set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl)
if(${SRB2_SYSTEM_BITS} EQUAL 64) if(${SRB2_SYSTEM_BITS} EQUAL 64)
set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib32 -lcurl")
else() # 32-bit
set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl") set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl")
else() # 32-bit
set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib32 -lcurl")
endif() endif()
else() else()
find_package(CURL) find_package(CURL)

2
src/d_clisrv.c
View file

@ -1449,7 +1449,7 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
// If there's an encoding error, send nothing, we accept that the above may be truncated // If there's an encoding error, send nothing, we accept that the above may be truncated
strncpy(netbuffer->u.serverinfo.httpsource, "", mirror_length); strncpy(netbuffer->u.serverinfo.httpsource, "", mirror_length);
netbuffer->u.serverinfo.httpsource[MAX_MIRROR_LENGTH-1] = 0; netbuffer->u.serverinfo.httpsource[MAX_MIRROR_LENGTH-1] = '\0';
#endif #endif
p = PutFileNeeded(0); p = PutFileNeeded(0);