From 3af2813fbf12c2ca14bca0bc492937502fe901f9 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 9 Jan 2016 16:29:59 +0100 Subject: [PATCH] Fixed: Compilation --HG-- branch : develop --- .../tools/3d/object_viewer_widget/src/object_viewer_widget.cpp | 2 +- code/ryzom/tools/client/client_patcher/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp b/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp index 328850ecd..54bc1cc19 100644 --- a/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp +++ b/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp @@ -762,7 +762,7 @@ namespace NLQT return proc(driver, message); #else x11Proc proc = (x11Proc)driver->getWindowProc(); - return proc(driver, message); + return proc(driver, (XEvent*)message); #endif } } diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt index c2f8ff3c6..ee6f34eb1 100644 --- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt +++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt @@ -3,6 +3,7 @@ FILE(GLOB SRC main.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/user_agent.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/client_cfg.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/login_patch.cpp + ${CMAKE_SOURCE_DIR}/ryzom/client/src/login_patch_seven_zip.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/login_xdelta.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.h