Merge with develop

--HG--
branch : compatibility-develop

code/CMakeLists.txt

@@ -116,6 +116,10 @@ FIND_PACKAGE(OpenSSL REQUIRED)
 FIND_PACKAGE(GIF)
 FIND_PACKAGE(Jpeg)
 
+IF(WIN32)
+  SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} Crypt32.lib)
+ENDIF()
+
 IF(WITH_LIBOVR)
   FIND_PACKAGE(LibOVR)
 ENDIF()
@@ -447,8 +451,6 @@ IF(WITH_NEL)
             SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${INTL_LIBRARY})
           ENDIF()
         ENDIF()
-      ELSEIF(WIN32)
-        SET(CURL_LIBRARIES ${CURL_LIBRARIES} Crypt32.lib)
       ENDIF()
     ENDIF()
   ENDIF()

code/CMakeModules/FindMySQL.cmake

@@ -69,6 +69,9 @@ ELSE()
       ENDIF()
       FIND_PACKAGE(OpenSSL)
       IF(OPENSSL_FOUND)
+        IF(WIN32)
+          SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} Crypt32.lib)
+        ENDIF()
         SET(MYSQL_LIBRARIES ${MYSQL_LIBRARIES} ${OPENSSL_LIBRARIES})
       ENDIF()
     ENDIF()

code/CMakeModules/Findassimp.cmake

@@ -1,29 +1,63 @@
+IF(assimp_FIND_REQUIRED)
+  SET(ASSIMP_FIND_REQUIRED ON)
+ENDIF()
+
 FIND_PATH(
-	assimp_INCLUDE_DIRS
+	ASSIMP_INCLUDE_DIRS
 	NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
 	PATHS /usr/local/include/
 )
 
 FIND_LIBRARY(
-	assimp_LIBRARIES
+	ASSIMP_LIBRARY_RELEASE
 	NAMES assimp
 	PATHS /usr/local/lib/
 )
 
-IF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
+FIND_LIBRARY(
-    SET(assimp_FOUND TRUE)
+	IRRXML_LIBRARY_RELEASE
+	NAMES IrrXML
+	PATHS /usr/local/lib/
+)
+
+FIND_LIBRARY(
+	ASSIMP_LIBRARY_DEBUG
+	NAMES assimpd
+	PATHS /usr/local/lib/
+)
+
+FIND_LIBRARY(
+	IRRXML_LIBRARY_DEBUG
+	NAMES IrrXMLd
+	PATHS /usr/local/lib/
+)
+
+IF (ASSIMP_INCLUDE_DIRS)
+    SET(ASSIMP_FOUND TRUE)
+    IF(ASSIMP_LIBRARY_RELEASE)
+      SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} optimized ${ASSIMP_LIBRARY_RELEASE})
+    ENDIF()
+    IF(ASSIMP_LIBRARY_DEBUG)
+      SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} debug ${ASSIMP_LIBRARY_DEBUG})
+    ENDIF()
     FIND_PACKAGE(ZLIB)
     IF(ZLIB_FOUND)
-        SET(assimp_LIBRARIES ${assimp_LIBRARIES} ${ZLIB_LIBRARIES})
+        SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} ${ZLIB_LIBRARIES})
+    ENDIF()
+    IF(IRRXML_LIBRARY_RELEASE)
+      SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} optimized ${IRRXML_LIBRARY_RELEASE})
+    ENDIF()
+    IF(IRRXML_LIBRARY_DEBUG)
+      SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} debug ${IRRXML_LIBRARY_DEBUG})
     ENDIF()
-ENDIF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
+ENDIF()
 
-IF (assimp_FOUND)
+IF (ASSIMP_FOUND)
-    IF (NOT assimp_FIND_QUIETLY)
+    IF (NOT ASSIMP_FIND_QUIETLY)
-        MESSAGE(STATUS "Found asset importer library: ${assimp_LIBRARIES}")
+        MESSAGE(STATUS "Found asset importer library: ${ASSIMP_LIBRARIES}")
-    ENDIF (NOT assimp_FIND_QUIETLY)
+    ENDIF ()
-ELSE (assimp_FOUND)
+ELSE (ASSIMP_FOUND)
-    IF (assimp_FIND_REQUIRED)
+    IF (ASSIMP_FIND_REQUIRED)
         MESSAGE(FATAL_ERROR "Could not find asset importer library")
-    ENDIF (assimp_FIND_REQUIRED)
+    ENDIF ()
-ENDIF (assimp_FOUND)
+ENDIF ()

code/nel/tools/3d/mesh_utils/CMakeLists.txt

@@ -3,11 +3,11 @@ FILE(GLOB HDRS *.h)
 
 SOURCE_GROUP("" FILES ${SRCS} ${HDRS})
 
-INCLUDE_DIRECTORIES(${assimp_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${ASSIMP_INCLUDE_DIRS})
 
 NL_TARGET_LIB(mesh_utils ${SRCS} ${HDRS})
 
-TARGET_LINK_LIBRARIES(mesh_utils ${assimp_LIBRARIES} nelmisc nelpipeline nel3d)
+TARGET_LINK_LIBRARIES(mesh_utils ${ASSIMP_LIBRARIES} nelmisc nelpipeline nel3d)
 NL_DEFAULT_PROPS(mesh_utils "NeL, Tools, 3D: Mesh Utils")
 NL_ADD_RUNTIME_FLAGS(mesh_utils)
 

code/nel/tools/logic/logic_editor_dll/logic_editor_interface.h

@@ -17,6 +17,8 @@
 #ifndef LOGIC_EDITOR_INTERFACE
 #define LOGIC_EDITOR_INTERFACE
 
+#include <tchar.h>
+
 #ifndef LOGIC_EDITOR_EXPORT
 #define LOGIC_EDITOR_EXPORT __declspec( dllimport ) 
 #endif // LOGIC_EDITOR_EXPORT