Merge with develop

--HG--
branch : compatibility-develop

code/CMakeModules/FindWindowsSDK.cmake

@@ -349,7 +349,6 @@ FIND_PATH(WINSDK_OPENGL_INCLUDE_DIR GL.h
 SET(WINSDK_LIBRARY_DIRS
   ${WINSDK_DIR}/Lib/winv6.3/um/${WINSDK8_SUFFIX}
   ${WINSDK_DIR}/Lib/win8/um/${WINSDK8_SUFFIX}
-  ${WINSDK_DIR}/Lib/${WINSDK_SUFFIX}
 )
 
 IF(WINSDK_SUFFIXES)

code/ryzom/client/src/client.rc

@@ -185,11 +185,19 @@ BEGIN
             VALUE "FileDescription", "Ryzom client"
             VALUE "FileVersion", RYZOM_VERSION
             VALUE "LegalCopyright", COPYRIGHT
+#if defined(FINAL_VERSION) && (FINAL_VERSION == 1)
 #ifdef _DEBUG
             VALUE "OriginalFilename", "ryzom_client_d.exe"
 #else
             VALUE "OriginalFilename", "ryzom_client_r.exe"
 #endif			
+#else
+#ifdef _DEBUG
+            VALUE "OriginalFilename", "ryzom_client_dev_d.exe"
+#else
+            VALUE "OriginalFilename", "ryzom_client_dev_r.exe"
+#endif			
+#endif
             VALUE "ProductName", "Ryzom Core"
             VALUE "ProductVersion", NL_VERSION
         END