edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 06:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use updated stub, switch around versions

Browse source
This commit is contained in:
Learath 2020-03-23 14:50:19 +03:00 committed by heinrich5991
parent 060d60f2ea
commit 6919ed3041
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ddnet-libs

@ -1 +1 @@
Subproject commit d018a902cb09b556c0454c25c6737031eb52f914
Subproject commit 7a52f1ac0af24b2eac04d890dadc6be33d2aa9dd

4
src/engine/client/backend_sdl.cpp
View file

@ -2189,8 +2189,10 @@ int CGraphicsBackend_SDL_OpenGL::Init(const char *pName, int *Screen, int *pWidt
SDL_VERSION(&Compiled);
SDL_GetVersion(&Linked);
dbg_msg("sdl", "SDL version %d.%d.%d (linked = %d.%d.%d)", Compiled.major, Compiled.minor, Compiled.patch, Linked.major, Linked.minor, Linked.patch);
dbg_msg("sdl", "SDL version %d.%d.%d (compiled = %d.%d.%d)", Linked.major, Linked.minor, Linked.patch,
Compiled.major, Compiled.minor, Compiled.patch);
}
if(!SDL_WasInit(SDL_INIT_VIDEO))
{
if(SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)

2
src/engine/client/http.cpp
View file

@ -45,7 +45,7 @@ bool HttpInit(IStorage *pStorage)
// print curl version
{
curl_version_info_data *pVersion = curl_version_info(CURLVERSION_NOW);
dbg_msg("http", "libcurl version " LIBCURL_VERSION" (linked=%s)", pVersion->version);
dbg_msg("http", "libcurl version %s (compiled = " LIBCURL_VERSION ")", pVersion->version);
}
pStorage->GetBinaryPath("data/ca-ddnet.pem", CA_FILE_PATH, sizeof(CA_FILE_PATH));

4
src/engine/client/text.cpp
View file

@ -596,8 +596,8 @@ public:
{
int LMajor, LMinor, LPatch;
FT_Library_Version(m_FTLibrary, &LMajor, &LMinor, &LPatch);
dbg_msg("freetype", "freetype version %d.%d.%d (linked=%d.%d.%d)", FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH,
LMajor, LMinor, LPatch);
dbg_msg("freetype", "freetype version %d.%d.%d (compiled = %d.%d.%d)", LMajor, LMinor, LPatch,
FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
}
m_FirstFreeTextContainerIndex = -1;