From 7292d41acfda640c6878f5e661539ec52e443d60 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 12 Apr 2016 19:55:05 +0200 Subject: [PATCH] Merge with develop --- code/CMakeLists.txt | 3 ++- code/ryzom/client/src/login_patch.cpp | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index a8ae865e3..9b9abe1c7 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -348,7 +348,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 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