Merge with develop

--HG--
branch : compatibility-develop

code/CMakeModules/Findassimp.cmake

@@ -12,6 +12,10 @@ FIND_LIBRARY(
 
 IF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
     SET(assimp_FOUND TRUE)
+    FIND_PACKAGE(ZLIB)
+    IF(ZLIB_FOUND)
+        SET(assimp_LIBRARIES ${assimp_LIBRARIES} ${ZLIB_LIBRARIES})
+    ENDIF()
 ENDIF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
 
 IF (assimp_FOUND)

code/nel/src/georges/CMakeLists.txt

@@ -7,7 +7,7 @@ NL_TARGET_LIB(nelgeorges ${HEADERS} ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 
-TARGET_LINK_LIBRARIES(nelgeorges ${LIBXML2_LIBRARIES} nelmisc)
+TARGET_LINK_LIBRARIES(nelgeorges nelmisc)
 SET_TARGET_PROPERTIES(nelgeorges PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelgeorges "NeL, Library: NeL Georges")
 NL_ADD_RUNTIME_FLAGS(nelgeorges)

code/nel/src/ligo/CMakeLists.txt

@@ -5,7 +5,7 @@ NL_TARGET_LIB(nelligo ${HEADERS} ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 
-TARGET_LINK_LIBRARIES(nelligo ${LIBXML2_LIBRARIES} nelmisc)
+TARGET_LINK_LIBRARIES(nelligo nelmisc)
 SET_TARGET_PROPERTIES(nelligo PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelligo "NeL, Library: NeL Ligo")
 NL_ADD_RUNTIME_FLAGS(nelligo)

code/nel/src/sound/CMakeLists.txt

@@ -98,7 +98,7 @@ ENDIF(WITH_STATIC)
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 
-TARGET_LINK_LIBRARIES(nelsound ${LIBXML2_LIBRARIES} nelmisc nelligo nelgeorges nel3d nelsnd_lowlevel)
+TARGET_LINK_LIBRARIES(nelsound nelmisc nelligo nelgeorges nel3d nelsnd_lowlevel)
 SET_TARGET_PROPERTIES(nelsound PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelsound "NeL, Library: NeL Sound")
 NL_ADD_RUNTIME_FLAGS(nelsound)

code/nel/tools/3d/mesh_export/main.cpp

@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 	if (!NLMISC::CFile::fileExists(filePath))
 	{
 		printHelp(args);
-		nlerror("File '%s' does not exist", filePath);
+		nlerror("File '%s' does not exist", filePath.c_str());
 		return EXIT_FAILURE;
 	}
 

code/ryzom/client/src/init.cpp

@@ -95,7 +95,13 @@
 
 #include "browse_faq.h"
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
+#ifndef RYZOM_CLIENT_ICON
+#define RYZOM_CLIENT_ICON "ryzom_client"
+#endif
 
 // XMLLib
 #include <libxml/xmlmemory.h>