Merge with develop

--HG--
branch : compatibility-develop

code/nel/src/3d/ps_mesh.cpp

@@ -1117,6 +1117,7 @@ void	CPSConstraintMesh::getShapesNames(std::string *shapesNames) const
 	std::copy(_MeshShapeFileName.begin(), _MeshShapeFileName.end(), stdext::make_unchecked_array_iterator(shapesNames));
 #else
 	std::copy(_MeshShapeFileName.begin(), _MeshShapeFileName.end(), shapesNames);
+#endif
 }
 
 

code/nel/src/3d/ps_ribbon.cpp

@@ -1469,6 +1469,7 @@ void CPSRibbon::getShape(CVector *shape) const
 	std::copy(_Shape.begin(), _Shape.end(), stdext::make_unchecked_array_iterator(shape));
 #else
 	std::copy(_Shape.begin(), _Shape.end(), shape);
+#endif
 }
 
 ///==================================================================================================================

code/nel/src/sound/driver/sound_driver.cpp

@@ -225,10 +225,10 @@ ISoundDriver *ISoundDriver::createDriver(IStringMapperProvider *stringMapper, TD
 	 *  MTR: Is there a way with NLMISC to replace SearchFile() ? Until then, no info for Linux.
 	 */
 #ifdef NL_OS_WINDOWS
-	char buffer[1024], *ptr;
-	uint len = SearchPath (NULL, dllName.c_str(), NULL, 1023, buffer, &ptr);
+	wchar_t buffer[1024], *ptr;
+	uint len = SearchPathW (NULL, utf8ToWide(dllName), NULL, 1023, buffer, &ptr);
 	if( len )
-		nlinfo ("Using the library '%s' that is in the directory: '%s'", dllName.c_str(), buffer);
+		nlinfo ("Using the library '%s' that is in the directory: '%s'", dllName.c_str(), wideToUtf8(buffer).c_str());
 #endif
 
 	createSoundDriver = (ISDRV_CREATE_PROC) driverLib.getSymbolAddress(IDRV_CREATE_PROC_NAME);