From 913b43f243aa380773a42c082c2c0005eb86b01c Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sat, 15 Oct 2016 10:37:56 +0200
Subject: [PATCH] Merge with develop

---
 code/CMakeLists.txt                   | 2 +-
 code/ryzom/client/unix/upgd_nl.sh     | 7 +++++++
 code/ryzom/client/windows/upgd_nl.bat | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index c85030049..0723c04a8 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -304,7 +304,7 @@ IF(WITH_QT5)
 
         ADD_QT_LIBRARY(XcbQpa)
         ADD_QT_LIBRARY(PlatformSupport)
-        SET(QT_LIBRARIES ${QT_LIBRARIES} -lX11-xcb -lXi -lSM -lICE -lxcb -lGL)
+        SET(QT_LIBRARIES ${QT_LIBRARIES} -lX11-xcb -lXi -lSM -lICE -lxcb -lGL -lxcb-glx)
         IF(EXISTS "${QT_LIBRARY_DIR}/libxcb-static.a")
           SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_LIBRARY_DIR}/libxcb-static.a")
         ENDIF()
diff --git a/code/ryzom/client/unix/upgd_nl.sh b/code/ryzom/client/unix/upgd_nl.sh
index 0e28a1555..1b4ba0176 100644
--- a/code/ryzom/client/unix/upgd_nl.sh
+++ b/code/ryzom/client/unix/upgd_nl.sh
@@ -13,4 +13,11 @@ chmod +x "$ROOTPATH/ryzom_client_patcher"
 chmod +x "$ROOTPATH/ryzom_configuration_qt"
 chmod +x "$ROOTPATH/ryzom_installer_qt"
 
+# copy Ryzom Installer if present in parent directory
+if [ -e "$ROOTPATH/../ryzom_installer_qt" ]
+then
+	rm -f "$ROOTPATH/../ryzom_installer_qt"
+  cp -a "$ROOTPATH/ryzom_installer_qt" "$ROOTPATH/.."
+fi
+
 exit 0
diff --git a/code/ryzom/client/windows/upgd_nl.bat b/code/ryzom/client/windows/upgd_nl.bat
index e0b64a5cf..ad19c2497 100644
--- a/code/ryzom/client/windows/upgd_nl.bat
+++ b/code/ryzom/client/windows/upgd_nl.bat
@@ -30,6 +30,10 @@ if exist %ROOTPATH%\msvcr100_win64.dll (
 if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe (
 	if exist %ROOTPATH%\..\ryzom_installer_qt_r.exe del %ROOTPATH%\..\ryzom_installer_qt_r.exe
 	copy /Y %ROOTPATH%\ryzom_installer_qt_r.exe %ROOTPATH%\..
+	if exist %ROOTPATH%\..\msvcp100.dll del %ROOTPATH%\..\msvcp100.dll
+	copy /Y %ROOTPATH%\msvcp100.dll %ROOTPATH%\..
+	if exist %ROOTPATH%\..\msvcr100.dll del %ROOTPATH%\..\msvcr100.dll
+	copy /Y %ROOTPATH%\msvcr100.dll %ROOTPATH%\..
 )
 
 :end