From 32ce9a47cbab15af220149f063500535f40be5d5 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 12 Apr 2016 19:54:05 +0200 Subject: [PATCH 1/2] Fixed: Compilation with Qt 5.6 --HG-- branch : develop --- code/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index c14632a0a..58c2d7db6 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -344,7 +344,8 @@ IF(WITH_QT5) IF(WIN32) SET(QT_LIBRARIES ${QT_LIBRARIES} ${WINSDK_LIBRARY_DIR}/Crypt32.lib - ${WINSDK_LIBRARY_DIR}/WS2_32.Lib) + ${WINSDK_LIBRARY_DIR}/WS2_32.Lib + ${WINSDK_LIBRARY_DIR}/IPHlpApi.Lib) ENDIF() # Core From 8090ddd12f3385fe207f236d9fd00f58edb2077a Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 12 Apr 2016 19:54:38 +0200 Subject: [PATCH 2/2] Changed: Display parameters passed to batch in log --HG-- branch : develop --- code/ryzom/client/src/login_patch.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index bbd896ec9..019baaab5 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -1040,6 +1040,13 @@ void CPatchManager::executeBatchFile() arguments.push_back(startupPath); #endif + // log parameters passed to Ryzom client + nlinfo("Restarting Ryzom..."); + nlinfo("RyzomFilename = %s", RyzomFilename.c_str()); + nlinfo("ClientPatchPath = %s", ClientPatchPath.c_str()); + nlinfo("ClientRootPath = %s", ClientRootPath.c_str()); + nlinfo("StartupPath = %s", startupPath.c_str()); + batchFilename += UpdateBatchFilename; // make script executable