aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-29 23:26:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-04-12 19:55:05 +02:00
commit 54ac3bd1d5
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/CMakeLists.txt
View file

@ -348,7 +348,8 @@ IF(WITH_QT5)
IF(WIN32) IF(WIN32)
SET(QT_LIBRARIES ${QT_LIBRARIES} SET(QT_LIBRARIES ${QT_LIBRARIES}
${WINSDK_LIBRARY_DIR}/Crypt32.lib ${WINSDK_LIBRARY_DIR}/Crypt32.lib
${WINSDK_LIBRARY_DIR}/WS2_32.Lib) ${WINSDK_LIBRARY_DIR}/WS2_32.Lib
${WINSDK_LIBRARY_DIR}/IPHlpApi.Lib)
ENDIF() ENDIF()
# Core # Core

7
code/ryzom/client/src/login_patch.cpp
View file

@ -1040,6 +1040,13 @@ void CPatchManager::executeBatchFile()
arguments.push_back(startupPath); arguments.push_back(startupPath);
#endif #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; batchFilename += UpdateBatchFilename;
// make script executable // make script executable