Merge with develop

--HG--
branch : compatibility-develop

code/CMakeLists.txt

@@ -33,9 +33,9 @@ IF(COMMAND cmake_policy)
   cmake_policy(SET CMP0005 OLD)
 ENDIF(COMMAND cmake_policy)
 
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/nel.cmake)
+INCLUDE(nel)
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/ConfigureChecks.cmake)
+INCLUDE(ConfigureChecks)
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/CheckDepends.cmake)
+INCLUDE(CheckDepends)
 INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
 
 # Force out of source builds.
@@ -49,7 +49,12 @@ PROJECT(RyzomCore CXX C)
 SET(NL_VERSION_MAJOR 0)
 SET(NL_VERSION_MINOR 12)
 SET(NL_VERSION_PATCH 0)
-SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}")
+SET(YEAR "2004-2015")
+SET(AUTHOR "Winchgate and The Ryzom Core Community")
+
+SET(RYZOM_VERSION_MAJOR 2)
+SET(RYZOM_VERSION_MINOR 1)
+SET(RYZOM_VERSION_PATCH 0)
 
 #-----------------------------------------------------------------------------
 # Redirect output files
@@ -94,7 +99,6 @@ NL_SETUP_BUILD_FLAGS()
 #Platform specifics
 
 SETUP_EXTERNAL()
-NL_GEN_REVISION_H()
 
 IF(WIN32)
   SET(WINSOCK2_LIB ws2_32.lib)

code/CMakeModules/ConfigureChecks.cmake

@@ -1,79 +1,56 @@
 MACRO(NL_CONFIGURE_CHECKS)
-  INCLUDE(CheckIncludeFiles)
+  INCLUDE(GetRevision)
-  INCLUDE(CheckFunctionExists)
-  INCLUDE(CheckLibraryExists)
-  INCLUDE(CheckTypeSize)
-  
-  CHECK_INCLUDE_FILES ("execinfo.h" HAVE_EXECINFO_H)
-  CHECK_INCLUDE_FILES ("stdint.h" HAVE_STDINT_H)
-  CHECK_INCLUDE_FILES ("sys/types.h" HAVE_SYS_TYPES_H)
-  CHECK_INCLUDE_FILES ("inttypes.h" HAVE_INTTYPES_H)
-  CHECK_INCLUDE_FILES ("unistd.h" HAVE_UNISTD_H)
-  CHECK_INCLUDE_FILES ("utime.h" HAVE_UTIME_H)
-  
-  CHECK_INCLUDE_FILES ("dl.h" HAVE_DL_H)
-  CHECK_INCLUDE_FILES ("limits.h" HAVE_LIMITS_H)
-  CHECK_INCLUDE_FILES ("malloc.h" HAVE_MALLOC_H)
-  CHECK_INCLUDE_FILES ("sys/param.h" HAVE_SYS_PARAM_H)
-  CHECK_INCLUDE_FILES ("sys/param.h;sys/mount.h" HAVE_SYS_MOUNT_H)
-  CHECK_INCLUDE_FILES ("sys/statvfs.h" HAVE_SYS_STATVFS_H)
-  
-  CHECK_INCLUDE_FILES ("pthread.h" HAVE_PTHREAD)
-  
-  CHECK_TYPE_SIZE("size_t" SIZEOF_SIZE_T)
-  #if (NOT HAVE_SIZEOF_SIZE_T)
-  #  MESSAGE(FATAL_ERROR "size_t is not present on this architecture - aborting")
-  #endif (NOT HAVE_SIZEOF_SIZE_T)
-  MESSAGE(STATUS "DEBUG size_t is ${SIZEOF_SIZE_T}")
-  
-  CHECK_TYPE_SIZE("off_t" SIZEOF_OFF_T)
-  MESSAGE(STATUS "DEBUG off_t is ${SIZEOF_OFF_T}")
-  
-  CHECK_FUNCTION_EXISTS("backtrace" HAVE_BACKTRACE)
-  CHECK_FUNCTION_EXISTS("getsockname" HAVE_GETSOCKNAME)
-  CHECK_FUNCTION_EXISTS("inet_ntoa" HAVE_INET_NTOA)
-  CHECK_FUNCTION_EXISTS("inet_ntop" HAVE_INET_NTOP)
-  CHECK_FUNCTION_EXISTS("inet_pton" HAVE_INET_PTON)
-  CHECK_FUNCTION_EXISTS("regcomp" HAVE_REGCOMP)
-  CHECK_FUNCTION_EXISTS("strerror" HAVE_STRERROR)
-  CHECK_FUNCTION_EXISTS("strlcat" HAVE_STRLCAT)
-  CHECK_FUNCTION_EXISTS("strptime" HAVE_STRPTIME)
-  CHECK_FUNCTION_EXISTS("strtok_r" HAVE_STRTOK_R)
-  CHECK_FUNCTION_EXISTS("strtoull" HAVE_STRTOULL)
-  CHECK_FUNCTION_EXISTS("statvfs" HAVE_STATVFS)
-  CHECK_FUNCTION_EXISTS("stat64" HAVE_STAT64)
 
   # 3D drivers
   IF(WITH_DRIVER_OPENGL)
     SET(NL_OPENGL_AVAILABLE 1)
-  ENDIF(WITH_DRIVER_OPENGL)
+  ENDIF()
 
   IF(WITH_DRIVER_OPENGLES)
     SET(NL_OPENGLES_AVAILABLE 1)
-  ENDIF(WITH_DRIVER_OPENGLES)
+  ENDIF()
 
   IF(WITH_DRIVER_DIRECT3D)
     SET(NL_DIRECT3D_AVAILABLE 1)
-  ENDIF(WITH_DRIVER_DIRECT3D)
+  ENDIF()
 
   # sound drivers
   IF(WITH_DRIVER_FMOD)
     SET(NL_FMOD_AVAILABLE 1)
-  ENDIF(WITH_DRIVER_FMOD)
+  ENDIF()
 
   IF(WITH_DRIVER_OPENAL)
     SET(NL_OPENAL_AVAILABLE 1)
-  ENDIF(WITH_DRIVER_OPENAL)
+  ENDIF()
 
   IF(WITH_DRIVER_DSOUND)
     SET(NL_DSOUND_AVAILABLE 1)
-  ENDIF(WITH_DRIVER_DSOUND)
+  ENDIF()
 
   IF(WITH_DRIVER_XAUDIO2)
     SET(NL_XAUDIO2_AVAILABLE 1)
-  ENDIF(WITH_DRIVER_XAUDIO2)
+  ENDIF()
 
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+  IF(NOT RYZOM_VERSION_MAJOR)
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+    SET(RYZOM_VERSION_MAJOR ${NL_VERSION_MAJOR})
+    SET(RYZOM_VERSION_MINOR ${NL_VERSION_MINOR})
+    SET(RYZOM_VERSION_PATCH ${NL_VERSION_PATCH})
+  ENDIF()
+
+  SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}.${REVISION}")
+  SET(NL_VERSION_RC "${NL_VERSION_MAJOR},${NL_VERSION_MINOR},${NL_VERSION_PATCH},${REVISION}")
+
+  SET(RYZOM_VERSION "${RYZOM_VERSION_MAJOR}.${RYZOM_VERSION_MINOR}.${RYZOM_VERSION_PATCH}.${REVISION}")
+  SET(RYZOM_VERSION_RC "${RYZOM_VERSION_MAJOR},${RYZOM_VERSION_MINOR},${RYZOM_VERSION_PATCH},${REVISION}")
+  NOW(BUILD_DATE)
+
+  SET(COPYRIGHT "${YEAR} ${AUTHOR}")
+
+  IF(NOT RYZOM_CLIENT_ICON)
+    SET(RYZOM_CLIENT_ICON "ryzom_client")
+  ENDIF()
+
+  CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
+  INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
   ADD_DEFINITIONS(-DHAVE_CONFIG_H)
-ENDMACRO(NL_CONFIGURE_CHECKS)
+ENDMACRO()

code/CMakeModules/GetRevision.cmake

@@ -7,7 +7,7 @@ IF(SOURCE_DIR)
   # Replace spaces by semi-columns
   IF(CMAKE_MODULE_PATH)
     STRING(REPLACE " " ";" CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
-  ENDIF(CMAKE_MODULE_PATH)
+  ENDIF()
 
   SET(CMAKE_MODULE_PATH ${SOURCE_DIR}/CMakeModules ${CMAKE_MODULE_PATH})
 
@@ -20,10 +20,16 @@ IF(SOURCE_DIR)
   ENDIF()
 ELSE()
   SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
-  SET(ROOT_DIR ${CMAKE_SOURCE_DIR})
+  SET(ROOT_DIR ${CMAKE_SOURCE_DIR}/..)
+
+  # convert ROOT_DIR to absolute path
+  GET_FILENAME_COMPONENT(ROOT_DIR ${ROOT_DIR} ABSOLUTE)
 ENDIF()
 
 MACRO(NOW RESULT)
+  IF(CMAKE_VERSION VERSION_GREATER "2.8.10")
+    STRING(TIMESTAMP ${RESULT} "%Y-%m-%d %H:%M:%S")
+  ELSE()
     IF(WIN32)
       EXECUTE_PROCESS(COMMAND "wmic" "os" "get" "localdatetime" OUTPUT_VARIABLE DATETIME)
       IF(NOT DATETIME MATCHES "ERROR")
@@ -36,7 +42,8 @@ MACRO(NOW RESULT)
       MESSAGE(SEND_ERROR "date not implemented")
       SET(${RESULT} "0000-00-00 00:00:00")
     ENDIF()
-ENDMACRO(NOW)
+  ENDIF()
+ENDMACRO()
 
 IF(EXISTS "${ROOT_DIR}/.svn/")
   FIND_PACKAGE(Subversion QUIET)
@@ -44,14 +51,14 @@ IF(EXISTS "${ROOT_DIR}/.svn/")
   IF(SUBVERSION_FOUND)
     Subversion_WC_INFO(${ROOT_DIR} ER)
     SET(REVISION ${ER_WC_REVISION})
-  ENDIF(SUBVERSION_FOUND)
+  ENDIF()
 
   FIND_PACKAGE(TortoiseSVN QUIET)
 
   IF(TORTOISESVN_FOUND)
     TORTOISESVN_GET_REVISION(${ROOT_DIR} REVISION)
-  ENDIF(TORTOISESVN_FOUND)
+  ENDIF()
-ENDIF(EXISTS "${ROOT_DIR}/.svn/")
+ENDIF()
 
 IF(EXISTS "${ROOT_DIR}/.hg/")
   FIND_PACKAGE(Mercurial)
@@ -73,11 +80,6 @@ IF(SOURCE_DIR AND NOT DEFINED REVISION)
   ENDIF()
 ENDIF()
 
-IF(SOURCE_DIR AND DEFINED REVISION)
+IF(DEFINED REVISION)
-  IF(EXISTS ${SOURCE_DIR}/revision.h.in)
+  MESSAGE(STATUS "Found revision ${REVISION}")
-    MESSAGE(STATUS "Revision: ${REVISION}")
-    NOW(BUILD_DATE)
-    CONFIGURE_FILE(${SOURCE_DIR}/revision.h.in revision.h.txt)
-    EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy revision.h.txt revision.h) # copy_if_different
-  ENDIF()
 ENDIF()

code/CMakeModules/nel.cmake

@@ -20,60 +20,6 @@ MACRO(NL_GEN_PC name)
   ENDIF(NOT WIN32 AND WITH_INSTALL_LIBRARIES)
 ENDMACRO(NL_GEN_PC)
 
-###
-# Helper macro that generates revision.h from revision.h.in
-###
-MACRO(NL_GEN_REVISION_H)
-  IF(EXISTS ${CMAKE_SOURCE_DIR}/revision.h.in)
-    SET(TOOL_FOUND OFF)
-
-    IF(EXISTS "${CMAKE_SOURCE_DIR}/../.svn/")
-      FIND_PACKAGE(Subversion)
-
-      IF(SUBVERSION_FOUND)
-        SET(TOOL_FOUND ON)
-      ENDIF(SUBVERSION_FOUND)
-    ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/../.svn/")
-
-    IF(EXISTS "${CMAKE_SOURCE_DIR}/../.hg/")
-      FIND_PACKAGE(Mercurial)
-
-      IF(MERCURIAL_FOUND)
-        SET(TOOL_FOUND ON)
-      ENDIF(MERCURIAL_FOUND)
-    ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/../.hg/")
-
-    # if already generated
-    IF(EXISTS ${CMAKE_SOURCE_DIR}/revision.h)
-      # copy it
-      MESSAGE(STATUS "Copying provided revision.h...")
-      FILE(COPY ${CMAKE_SOURCE_DIR}/revision.h DESTINATION ${CMAKE_BINARY_DIR})
-      SET(HAVE_REVISION_H ON)
-    ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/revision.h)
-
-    IF(TOOL_FOUND)
-      # a custom target that is always built
-      ADD_CUSTOM_TARGET(revision ALL
-        COMMAND ${CMAKE_COMMAND}
-        -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-        -DROOT_DIR=${CMAKE_SOURCE_DIR}/..
-        -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/CMakeModules
-        -P ${CMAKE_SOURCE_DIR}/CMakeModules/GetRevision.cmake)
-
-      # revision.h is a generated file
-      SET_SOURCE_FILES_PROPERTIES(${CMAKE_BINARY_DIR}/revision.h
-        PROPERTIES GENERATED TRUE
-        HEADER_FILE_ONLY TRUE)
-      SET(HAVE_REVISION_H ON)
-    ENDIF(TOOL_FOUND)
-
-    IF(HAVE_REVISION_H)
-      INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
-      ADD_DEFINITIONS(-DHAVE_REVISION_H)
-    ENDIF(HAVE_REVISION_H)
-  ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/revision.h.in)
-ENDMACRO(NL_GEN_REVISION_H)
-
 ###
 #
 ###

code/config.h.cmake

@@ -1,39 +1,6 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#cmakedefine HAVE_DL_H 1
-#cmakedefine HAVE_EXECINFO_H 1
-#cmakedefine HAVE_ICONV 1
-#cmakedefine HAVE_INTTYPES_H 1
-#cmakedefine HAVE_LANGINFO_CODESET 1
-#cmakedefine HAVE_LIMITS_H 1
-#cmakedefine HAVE_MALLOC_H 1
-#cmakedefine HAVE_PAM_MISC_H 1
-#cmakedefine HAVE_PAM_PAM_APPL_H 1
-#cmakedefine HAVE_PTHREAD 1
-#cmakedefine HAVE_SECURITY_PAM_APPL_H 1
-#cmakedefine HAVE_SECURITY_PAM_MISC_H 1
-#cmakedefine HAVE_STDINT_H 1
-#cmakedefine HAVE_SYS_MOUNT_H 1
-#cmakedefine HAVE_SYS_PARAM_H 1
-#cmakedefine HAVE_SYS_STATVFS_H 1
-#cmakedefine HAVE_SYS_TYPES_H 1
-#cmakedefine HAVE_UNISTD_H 1
-#cmakedefine HAVE_UTIME_H 1
-#cmakedefine HAVE_WCHAR_H 1
-
-#cmakedefine HAVE_BACKTRACE 1
-#cmakedefine HAVE_INET_NTOA 1
-#cmakedefine HAVE_INET_NTOP 1
-#cmakedefine HAVE_INET_PTON 1
-#cmakedefine HAVE_STRERROR 1
-#cmakedefine HAVE_STRLCAT 1
-#cmakedefine HAVE_STRPTIME 1
-#cmakedefine HAVE_STRTOK_R 1
-#cmakedefine HAVE_STRTOULL 1
-#cmakedefine HAVE_STATVFS 1
-#cmakedefine HAVE_STAT64 1
-
 #cmakedefine NL_OPENGL_AVAILABLE ${NL_OPENGL_AVAILABLE}
 #cmakedefine NL_OPENGLES_AVAILABLE ${NL_OPENGLES_AVAILABLE}
 #cmakedefine NL_DIRECT3D_AVAILABLE ${NL_DIRECT3D_AVAILABLE}
@@ -53,4 +20,18 @@
 #cmakedefine RYZOM_ETC_PREFIX "${RYZOM_ETC_ABSOLUTE_PREFIX}"
 #cmakedefine RYZOM_SHARE_PREFIX "${RYZOM_SHARE_ABSOLUTE_PREFIX}"
 
+#cmakedefine REVISION "${REVISION}"
+#cmakedefine BUILD_DATE "${BUILD_DATE}"
+
+#cmakedefine NL_VERSION "${NL_VERSION}"
+#cmakedefine NL_VERSION_RC ${NL_VERSION_RC}
+
+#cmakedefine RYZOM_VERSION "${RYZOM_VERSION}"
+#cmakedefine RYZOM_VERSION_RC ${RYZOM_VERSION_RC}
+#cmakedefine AUTHOR "${AUTHOR}"
+#cmakedefine YEAR "${YEAR}"
+#cmakedefine COPYRIGHT "${COPYRIGHT}"
+
+#cmakedefine RYZOM_CLIENT_ICON "${RYZOM_CLIENT_ICON}"
+
 #endif // CONFIG_H

code/nel/src/3d/driver/direct3d/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB SRC *.cpp *.h *.def)
+FILE(GLOB SRC *.cpp *.h *.def *.rc)
 
 NL_TARGET_DRIVER(nel_drv_direct3d_win ${SRC})
 
@@ -14,11 +14,11 @@ ADD_DEFINITIONS(-DRIVER_DIRECT3D_EXPORTS)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nel_drv_direct3d_win ${CMAKE_CURRENT_SOURCE_DIR}/stddirect3d.h ${CMAKE_CURRENT_SOURCE_DIR}/stddirect3d.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
   INSTALL(TARGETS nel_drv_direct3d_win LIBRARY DESTINATION ${NL_DRIVER_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} RUNTIME DESTINATION ${NL_DRIVER_PREFIX} COMPONENT drivers3d)
   IF(WITH_MAXPLUGIN)
     INSTALL(TARGETS nel_drv_direct3d_win RUNTIME DESTINATION maxplugin COMPONENT drivers3d)
-  ENDIF(WITH_MAXPLUGIN)
+  ENDIF()
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
+ENDIF()

code/nel/src/3d/driver/direct3d/resources.rc

@@ -0,0 +1,37 @@
+#include <windows.h>
+#include "config.h"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION NL_VERSION_RC
+PRODUCTVERSION NL_VERSION_RC
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "NeL Direct3D driver"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+#ifdef _DEBUG
+            VALUE "OriginalFilename", "nel_drv_direct3d_win_d.dll"
+#else
+            VALUE "OriginalFilename", "nel_drv_direct3d_win_r.dll"
+#endif			
+            VALUE "ProductName", "Ryzom Core"
+            VALUE "ProductVersion", NL_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END

code/nel/src/3d/driver/opengl/CMakeLists.txt

@@ -4,26 +4,26 @@ IF(NOT WIN32)
   IF(APPLE)
     FIND_LIBRARY(CARBON NAMES Carbon)
     FIND_LIBRARY(COCOA NAMES Cocoa)
-  ELSE(APPLE)
+  ELSE()
     FIND_PACKAGE(X11)
     FIND_PACKAGE(XF86VidMode)
-  ENDIF(APPLE)
+  ENDIF()
-ENDIF(NOT WIN32)
+ENDIF()
 
-FILE(GLOB SRC *.cpp *.h *.def)
+FILE(GLOB SRC *.cpp *.h *.def *.rc)
 
 IF(APPLE)
   FILE(GLOB MAC_SRC mac/*.h mac/*.m mac/*.mm mac/*.cpp)
   SET(SRC ${SRC} ${MAC_SRC})
   SET_SOURCE_FILES_PROPERTIES(${SRC}
     PROPERTIES COMPILE_FLAGS "-x objective-c++")
-ENDIF(APPLE)
+ENDIF()
 
 IF(WIN32)
   SET(NLDRV_OGL_LIB "nel_drv_opengl_win")
-ELSE(WIN32)
+ELSE()
   SET(NLDRV_OGL_LIB "nel_drv_opengl")
-ENDIF(WIN32)
+ENDIF()
 
 NL_TARGET_DRIVER(${NLDRV_OGL_LIB} ${SRC})
 
@@ -38,12 +38,12 @@ IF(WIN32)
   INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR})
   TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY})
   ADD_DEFINITIONS(-DDRIVER_OPENGL_EXPORTS)
-ENDIF(WIN32)
+ENDIF()
 
 IF(APPLE)
   TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${CARBON})
   TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${COCOA})
-ENDIF(APPLE)
+ENDIF()
 
 IF(UNIX AND NOT APPLE)
   TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${X11_X11_LIB})
@@ -51,41 +51,41 @@ IF(UNIX AND NOT APPLE)
     INCLUDE_DIRECTORIES(${XF86VidMode_INCLUDE_DIR})
     ADD_DEFINITIONS(${XF86VidMode_DEFINITIONS})
     TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${XF86VidMode_LIBRARY})
-  ENDIF(XF86VidMode_FOUND)
+  ENDIF()
   IF(X11_Xrandr_FOUND)
     INCLUDE_DIRECTORIES(${X11_Xrandr_INCLUDE_PATH})
     ADD_DEFINITIONS(-DHAVE_XRANDR)
     TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${X11_Xrandr_LIB})
-  ENDIF(X11_Xrandr_FOUND)
+  ENDIF()
   IF(X11_Xrender_FOUND)
     INCLUDE_DIRECTORIES(${X11_Xrender_INCLUDE_PATH})
     ADD_DEFINITIONS(-DHAVE_XRENDER)
     TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${X11_Xrender_LIB})
-  ENDIF(X11_Xrender_FOUND)
+  ENDIF()
   IF(X11_Xcursor_FOUND)
     INCLUDE_DIRECTORIES(${X11_Xcursor_INCLUDE_PATH})
     ADD_DEFINITIONS(-DHAVE_XCURSOR)
     TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${X11_Xcursor_LIB})
-  ENDIF(X11_Xcursor_FOUND)
+  ENDIF()
   IF(X11_Xext_FOUND)
     TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${X11_Xext_LIB})
-  ENDIF(X11_Xext_FOUND)
+  ENDIF()
   # libraries needed to be linked while linking to static X11 libraries
   FIND_LIBRARY(XCB_LIBRARY
     NAMES xcb
     HINTS ${X11_LIB_SEARCH_PATH})
   IF(XCB_LIBRARY)
     TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${XCB_LIBRARY})
-  ENDIF(XCB_LIBRARY)
+  ENDIF()
-ENDIF(UNIX AND NOT APPLE)
+ENDIF()
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(${NLDRV_OGL_LIB} ${CMAKE_CURRENT_SOURCE_DIR}/stdopengl.h ${CMAKE_CURRENT_SOURCE_DIR}/stdopengl.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
   INSTALL(TARGETS ${NLDRV_OGL_LIB} LIBRARY DESTINATION ${NL_DRIVER_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} RUNTIME DESTINATION ${NL_DRIVER_PREFIX} COMPONENT drivers3d)
   IF(WITH_MAXPLUGIN)
     INSTALL(TARGETS ${NLDRV_OGL_LIB} RUNTIME DESTINATION maxplugin COMPONENT drivers3d)
-  ENDIF(WITH_MAXPLUGIN)
+  ENDIF()
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
+ENDIF()

code/nel/src/3d/driver/opengl/resources.rc

@@ -0,0 +1,37 @@
+#include <windows.h>
+#include "config.h"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION NL_VERSION_RC
+PRODUCTVERSION NL_VERSION_RC
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "NeL OpenGL driver"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+#ifdef _DEBUG
+            VALUE "OriginalFilename", "nel_drv_opengl_win_d.dll"
+#else
+            VALUE "OriginalFilename", "nel_drv_opengl_win_r.dll"
+#endif			
+            VALUE "ProductName", "Ryzom Core"
+            VALUE "ProductVersion", NL_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END

code/nel/src/3d/driver/opengles/CMakeLists.txt

@@ -4,21 +4,21 @@ IF(NOT WIN32)
   IF(APPLE)
     FIND_LIBRARY(CARBON NAMES Carbon)
     FIND_LIBRARY(COCOA NAMES Cocoa)
-  ELSE(APPLE)
+  ELSE()
     FIND_PACKAGE(X11)
     FIND_PACKAGE(XF86VidMode)
-  ENDIF(APPLE)
+  ENDIF()
-ENDIF(NOT WIN32)
+ENDIF()
 
 SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}/nel/src/3d/driver/opengl)
 
-FILE(GLOB SRC ${SOURCE_DIR}/*.cpp ${SOURCE_DIR}/*.h ${SOURCE_DIR}/*.def)
+FILE(GLOB SRC ${SOURCE_DIR}/*.cpp ${SOURCE_DIR}/*.h ${SOURCE_DIR}/*.def *.rc)
 
 IF(APPLE)
   FILE(GLOB MAC_SRC ${SOURCE_DIR}/mac/*.h ${SOURCE_DIR}/mac/*.m ${SOURCE_DIR}/mac/*.mm ${SOURCE_DIR}/mac/*.cpp)
   SET(SRC ${SRC} ${MAC_SRC})
   SET_SOURCE_FILES_PROPERTIES(${SRC} PROPERTIES COMPILE_FLAGS "-x objective-c++")
-ENDIF(APPLE)
+ENDIF()
 
 INCLUDE_DIRECTORIES(${SOURCE_DIR} ${OPENGLES_INCLUDE_DIR})
 
@@ -26,9 +26,9 @@ ADD_DEFINITIONS(-DUSE_OPENGLES)
 
 IF(WIN32)
   SET(NLDRV_OGLES_LIB "nel_drv_opengles_win")
-ELSE(WIN32)
+ELSE()
   SET(NLDRV_OGLES_LIB "nel_drv_opengles")
-ENDIF(WIN32)
+ENDIF()
 
 NL_TARGET_DRIVER(${NLDRV_OGLES_LIB} ${SRC})
 
@@ -41,12 +41,12 @@ IF(WIN32)
   INCLUDE_DIRECTORIES(BEFORE ${DXSDK_INCLUDE_DIR})
   TARGET_LINK_LIBRARIES(${NLDRV_OGLES_LIB} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY})
   ADD_DEFINITIONS(/DDRIVER_OPENGLES_EXPORTS)
-ENDIF(WIN32)
+ENDIF()
 
 IF(APPLE)
   TARGET_LINK_LIBRARIES(${NLDRV_OGLES_LIB} ${CARBON})
   TARGET_LINK_LIBRARIES(${NLDRV_OGLES_LIB} ${COCOA})
-ENDIF(APPLE)
+ENDIF()
 
 IF(UNIX AND NOT APPLE)
   TARGET_LINK_LIBRARIES(${NLDRV_OGLES_LIB} ${X11_X11_LIB})
@@ -54,31 +54,31 @@ IF(UNIX AND NOT APPLE)
     INCLUDE_DIRECTORIES(${XF86VidMode_INCLUDE_DIR})
     ADD_DEFINITIONS(${XF86VidMode_DEFINITIONS})
     TARGET_LINK_LIBRARIES(${NLDRV_OGLES_LIB} ${XF86VidMode_LIBRARY})
-  ENDIF(XF86VidMode_FOUND)
+  ENDIF()
   IF(X11_Xrandr_FOUND)
     INCLUDE_DIRECTORIES(${X11_Xrandr_INCLUDE_PATH})
     ADD_DEFINITIONS(-DHAVE_XRANDR)
     TARGET_LINK_LIBRARIES(${NLDRV_OGLES_LIB} ${X11_Xrandr_LIB})
-  ENDIF(X11_Xrandr_FOUND)
+  ENDIF()
   IF(X11_Xrender_FOUND)
     INCLUDE_DIRECTORIES(${X11_Xrender_INCLUDE_PATH})
     ADD_DEFINITIONS(-DHAVE_XRENDER)
     TARGET_LINK_LIBRARIES(${NLDRV_OGLES_LIB} ${X11_Xrender_LIB})
-  ENDIF(X11_Xrender_FOUND)
+  ENDIF()
   IF(X11_Xcursor_FOUND)
     INCLUDE_DIRECTORIES(${X11_Xcursor_INCLUDE_PATH})
     ADD_DEFINITIONS(-DHAVE_XCURSOR)
     TARGET_LINK_LIBRARIES(${NLDRV_OGLES_LIB} ${X11_Xcursor_LIB})
-  ENDIF(X11_Xcursor_FOUND)
+  ENDIF()
-ENDIF(UNIX AND NOT APPLE)
+ENDIF()
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(${NLDRV_OGLES_LIB} ${SOURCE_DIR}/stdopengl.h ${SOURCE_DIR}/stdopengl.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
   INSTALL(TARGETS ${NLDRV_OGLES_LIB} LIBRARY DESTINATION ${NL_DRIVER_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} RUNTIME DESTINATION ${NL_DRIVER_PREFIX} COMPONENT drivers3d)
   IF(WITH_MAXPLUGIN)
     INSTALL(TARGETS ${NLDRV_OGLES_LIB} RUNTIME DESTINATION maxplugin COMPONENT drivers3d)
-  ENDIF(WITH_MAXPLUGIN)
+  ENDIF()
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
+ENDIF()

code/nel/src/3d/driver/opengles/resources.rc

@@ -0,0 +1,37 @@
+#include <windows.h>
+#include "config.h"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION NL_VERSION_RC
+PRODUCTVERSION NL_VERSION_RC
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "NeL OpenGL ES 1.1 driver"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+#ifdef _DEBUG
+            VALUE "OriginalFilename", "nel_drv_opengles_win_d.dll"
+#else
+            VALUE "OriginalFilename", "nel_drv_opengles_win_r.dll"
+#endif			
+            VALUE "ProductName", "Ryzom Core"
+            VALUE "ProductVersion", NL_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END

code/nel/src/sound/driver/dsound/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB SRC *.cpp *.h *.def)
+FILE(GLOB SRC *.cpp *.h *.def *.rc)
 
 NL_TARGET_DRIVER(nel_drv_dsound_win ${SRC})
 
@@ -11,11 +11,11 @@ NL_ADD_LIB_SUFFIX(nel_drv_dsound_win)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nel_drv_dsound_win ${CMAKE_CURRENT_SOURCE_DIR}/stddsound.h ${CMAKE_CURRENT_SOURCE_DIR}/stddsound.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
   INSTALL(TARGETS nel_drv_dsound_win RUNTIME DESTINATION ${NL_DRIVER_PREFIX} LIBRARY DESTINATION ${NL_DRIVER_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT driverssound)
   IF(WITH_MAXPLUGIN)
     INSTALL(TARGETS nel_drv_dsound_win RUNTIME DESTINATION maxplugin COMPONENT driverssound)
-  ENDIF(WITH_MAXPLUGIN)
+  ENDIF()
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
+ENDIF()

code/nel/src/sound/driver/dsound/resources.rc

@@ -0,0 +1,37 @@
+#include <windows.h>
+#include "config.h"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION NL_VERSION_RC
+PRODUCTVERSION NL_VERSION_RC
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "NeL DirectSound driver"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+#ifdef _DEBUG
+            VALUE "OriginalFilename", "nel_drv_dsound_win_d.dll"
+#else
+            VALUE "OriginalFilename", "nel_drv_dsound_win_r.dll"
+#endif			
+            VALUE "ProductName", "Ryzom Core"
+            VALUE "ProductVersion", NL_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END

code/nel/src/sound/driver/fmod/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB SRC *.cpp *.h *.def)
+FILE(GLOB SRC *.cpp *.h *.def *.rc)
 
 NL_TARGET_DRIVER(nel_drv_fmod_win ${SRC})
 
@@ -11,11 +11,11 @@ NL_ADD_LIB_SUFFIX(nel_drv_fmod_win)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nel_drv_fmod_win ${CMAKE_CURRENT_SOURCE_DIR}/stdfmod.h ${CMAKE_CURRENT_SOURCE_DIR}/stdfmod.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
   INSTALL(TARGETS nel_drv_fmod_win RUNTIME DESTINATION ${NL_DRIVER_PREFIX} LIBRARY DESTINATION ${NL_DRIVER_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT driverssound)
   IF(WITH_MAXPLUGIN)
     INSTALL(TARGETS nel_drv_fmod_win RUNTIME DESTINATION maxplugin COMPONENT driverssound)
-  ENDIF(WITH_MAXPLUGIN)
+  ENDIF()
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
+ENDIF()

code/nel/src/sound/driver/fmod/resources.rc

@@ -0,0 +1,37 @@
+#include <windows.h>
+#include "config.h"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION NL_VERSION_RC
+PRODUCTVERSION NL_VERSION_RC
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "NeL FMod driver"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+#ifdef _DEBUG
+            VALUE "OriginalFilename", "nel_drv_fmod_win_d.dll"
+#else
+            VALUE "OriginalFilename", "nel_drv_fmod_win_r.dll"
+#endif			
+            VALUE "ProductName", "Ryzom Core"
+            VALUE "ProductVersion", NL_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END

code/nel/src/sound/driver/openal/CMakeLists.txt

@@ -1,10 +1,10 @@
-FILE(GLOB SRC *.cpp *.h *.def)
+FILE(GLOB SRC *.cpp *.h *.def *.rc)
 
 IF(WIN32)
   SET(NLDRV_AL_LIB "nel_drv_openal_win")
-ELSE(WIN32)
+ELSE()
   SET(NLDRV_AL_LIB "nel_drv_openal")
-ENDIF(WIN32)
+ENDIF()
 
 SOURCE_GROUP(efx FILES
         effect_al.cpp
@@ -38,15 +38,15 @@ IF(WIN32)
   FIND_PACKAGE(EFXUtil)
   INCLUDE_DIRECTORIES(${EFXUTIL_INCLUDE_DIR})
   TARGET_LINK_LIBRARIES(${NLDRV_AL_LIB} ${EFXUTIL_LIBRARY})
-ENDIF(WIN32)
+ENDIF()
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(${NLDRV_AL_LIB} ${CMAKE_CURRENT_SOURCE_DIR}/stdopenal.h ${CMAKE_CURRENT_SOURCE_DIR}/stdopenal.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
   INSTALL(TARGETS ${NLDRV_AL_LIB} RUNTIME DESTINATION ${NL_DRIVER_PREFIX} LIBRARY DESTINATION ${NL_DRIVER_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT driverssound)
   IF(WITH_MAXPLUGIN)
     INSTALL(TARGETS ${NLDRV_AL_LIB} RUNTIME DESTINATION maxplugin COMPONENT driverssound)
-  ENDIF(WITH_MAXPLUGIN)
+  ENDIF()
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
+ENDIF()

code/nel/src/sound/driver/openal/resources.rc

@@ -0,0 +1,37 @@
+#include <windows.h>
+#include "config.h"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION NL_VERSION_RC
+PRODUCTVERSION NL_VERSION_RC
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "NeL OpenAL driver"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+#ifdef _DEBUG
+            VALUE "OriginalFilename", "nel_drv_openal_win_d.dll"
+#else
+            VALUE "OriginalFilename", "nel_drv_openal_win_r.dll"
+#endif			
+            VALUE "ProductName", "Ryzom Core"
+            VALUE "ProductVersion", NL_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END

code/nel/src/sound/driver/xaudio2/CMakeLists.txt

@@ -1,4 +1,4 @@
-FILE(GLOB SRC *.cpp *.h *.def)
+FILE(GLOB SRC *.cpp *.h *.def *.rc)
 
 SOURCE_GROUP(sfx FILES
         buffer_xaudio2.cpp
@@ -38,11 +38,11 @@ NL_ADD_LIB_SUFFIX(nel_drv_xaudio2_win)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nel_drv_xaudio2_win ${CMAKE_CURRENT_SOURCE_DIR}/stdxaudio2.h ${CMAKE_CURRENT_SOURCE_DIR}/stdxaudio2.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
   INSTALL(TARGETS nel_drv_xaudio2_win RUNTIME DESTINATION ${NL_DRIVER_PREFIX} LIBRARY DESTINATION ${NL_DRIVER_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT driverssound)
   IF(WITH_MAXPLUGIN)
     INSTALL(TARGETS nel_drv_xaudio2_win RUNTIME DESTINATION maxplugin COMPONENT driverssound)
-  ENDIF(WITH_MAXPLUGIN)
+  ENDIF()
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
+ENDIF()

code/nel/src/sound/driver/xaudio2/resources.rc

@@ -0,0 +1,37 @@
+#include <windows.h>
+#include "config.h"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION NL_VERSION_RC
+PRODUCTVERSION NL_VERSION_RC
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "NeL XAudio2 driver"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+#ifdef _DEBUG
+            VALUE "OriginalFilename", "nel_drv_xaudio2_win_d.dll"
+#else
+            VALUE "OriginalFilename", "nel_drv_xaudio2_win_r.dll"
+#endif			
+            VALUE "ProductName", "Ryzom Core"
+            VALUE "ProductVersion", NL_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END

code/revision.h.in

@@ -1,7 +0,0 @@
-#ifndef REVISION_H
-#define REVISION_H
-
-#cmakedefine REVISION "${REVISION}"
-#cmakedefine BUILD_DATE "${BUILD_DATE}"
-
-#endif

code/ryzom/client/CMakeLists.txt

@@ -1,21 +1,18 @@
-
 # Need clientsheets lib for sheets packer tool
 ADD_SUBDIRECTORY(src)
 
 IF(WITH_RYZOM_CLIENT)
-
   #ADD_SUBDIRECTORY(data)
   #ADD_SUBDIRECTORY(patcher)
 
   IF(UNIX AND NOT APPLE)
     ADD_SUBDIRECTORY(unix)
-ENDIF(UNIX AND NOT APPLE)
+  ENDIF()
 
   IF(RYZOM_ETC_PREFIX)
     CONFIGURE_FILE(client_default.cfg.in "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg")
     INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/client_default.cfg" DESTINATION ${RYZOM_ETC_PREFIX})
-ELSE(RYZOM_ETC_PREFIX)
+  ELSE()
     INSTALL(FILES client_default.cfg DESTINATION etc/ryzom)
-ENDIF(RYZOM_ETC_PREFIX)
+  ENDIF()
-
+ENDIF()
-ENDIF(WITH_RYZOM_CLIENT)

code/ryzom/client/src/CMakeLists.txt

@@ -10,7 +10,7 @@ ADD_SUBDIRECTORY(seven_zip)
 
 IF(WITH_RYZOM_PATCH)
   ADD_DEFINITIONS(-DRZ_USE_PATCH)
-ENDIF(WITH_RYZOM_PATCH)
+ENDIF()
 
 FILE(GLOB CFG ../*.cfg ../*.cfg.in)
 FILE(GLOB SRC *.cpp *.h motion/*.cpp motion/*.h client.rc)
@@ -47,31 +47,19 @@ SOURCE_GROUP("r2" FILES ${SRC_R2})
 
 # on Mac, create a .App Bundle
 if(APPLE)
-  SET(RYZOM_VERSION_SHORT "2.1.0")
-  SET(RYZOM_VERSION_LONG "2.1.0")
-
-  # define directories used by GetRevision
-  SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
-  SET(ROOT_DIR ${CMAKE_SOURCE_DIR}/..)
-  INCLUDE(GetRevision)
-
-  IF(REVISION)
-    SET(RYZOM_VERSION_LONG "${RYZOM_VERSION_LONG}.${REVISION}")
-  ENDIF()
-
   SET(MACOSX_BUNDLE_INFO_STRING "Ryzom")
   SET(MACOSX_BUNDLE_ICON_FILE "ryzom.icns")
   SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.winchgate.Ryzom")
-  SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${RYZOM_VERSION_LONG})
+  SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${RYZOM_VERSION})
   SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom")
-  SET(MACOSX_BUNDLE_SHORT_VERSION_STRING ${RYZOM_VERSION_SHORT})
+  SET(MACOSX_BUNDLE_SHORT_VERSION_STRING ${RYZOM_VERSION})
   SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0")
-  SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community")
+  SET(MACOSX_BUNDLE_COPYRIGHT ${COPYRIGHT})
   SET(RYZOM_OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${MACOSX_BUNDLE_BUNDLE_NAME}.app)
   SET(RYZOM_CONTENTS_DIR ${RYZOM_OUTPUT_DIR}/Contents)
   SET(RYZOM_RESOURCES_DIR ${RYZOM_CONTENTS_DIR}/Resources)
   SET(MAC_RESOURCES_DIR ${CMAKE_SOURCE_DIR}/ryzom/client/macosx)
-ENDIF(APPLE)
+ENDIF()
 
 ADD_EXECUTABLE(ryzom_client WIN32 MACOSX_BUNDLE ${SRC} ${SRC_INTERFACE} ${SRC_MODE} ${SRC_R2})
 
@@ -86,8 +74,8 @@ IF(APPLE)
 
   IF(RYZOM_DATA_DIR)
     ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD COMMAND cp ARGS -RpX ${RYZOM_DATA_DIR} ${RYZOM_RESOURCES_DIR})
-  ENDIF(RYZOM_DATA_DIR)
+  ENDIF()
-ENDIF(APPLE)
+ENDIF()
 
 INCLUDE_DIRECTORIES(
 			${CMAKE_CURRENT_SOURCE_DIR}
@@ -118,12 +106,12 @@ TARGET_LINK_LIBRARIES(ryzom_client
 
 IF(NOT APPLE AND NOT WIN32)
   TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES})
-ENDIF(NOT APPLE AND NOT WIN32)
+ENDIF()
 
 IF(APPLE)
   FIND_LIBRARY(FOUNDATION_LIBRARY Foundation)
   TARGET_LINK_LIBRARIES(ryzom_client ${FOUNDATION_LIBRARY})
-ENDIF(APPLE)
+ENDIF()
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS})
 
@@ -137,13 +125,13 @@ IF(WITH_RYZOM_CLIENT_UAC)
     SET_PROPERTY(TARGET ryzom_client PROPERTY LINK_FLAGS_RELEASE "/level='requireAdministrator'")
   ELSEIF(CMAKE_GENERATOR MATCHES "NMake Makefiles")
     SET_PROPERTY(TARGET ryzom_client PROPERTY LINK_FLAGS_RELEASE "/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"")
-  ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio")
+  ENDIF()
-ENDIF(WITH_RYZOM_CLIENT_UAC)
+ENDIF()
 
 IF(WITH_PCH AND (NOT MINGW OR NOT WITH_SYMBOLS))
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH AND (NOT MINGW OR NOT WITH_SYMBOLS))
+ENDIF()
 
 INSTALL(TARGETS ryzom_client RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client BUNDLE DESTINATION /Applications)
 
-ENDIF(WITH_RYZOM_CLIENT)
+ENDIF()

code/ryzom/client/src/client.rc

@@ -8,6 +8,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include <windows.h>
+#include "config.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -165,8 +166,8 @@ IDB_ERROR_LOGO          BITMAP  DISCARDABLE     "error_logo.bmp"
 /////////////////////////////////////////////////////////////////////////////
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,1,0
+FILEVERSION RYZOM_VERSION_RC
-PRODUCTVERSION 2,1,0
+PRODUCTVERSION NL_VERSION_RC
 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
 FILEFLAGS VS_FF_DEBUG
@@ -182,15 +183,15 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "Ryzom client"
-            VALUE "FileVersion", "2.1.0"
+            VALUE "FileVersion", RYZOM_VERSION
-            VALUE "LegalCopyright", "Copyright (C) 2004-2015 Winchgate and The Ryzom Core Community"
+            VALUE "LegalCopyright", COPYRIGHT
 #ifdef _DEBUG
             VALUE "OriginalFilename", "ryzom_client_d.exe"
 #else
             VALUE "OriginalFilename", "ryzom_client_r.exe"
 #endif			
-            VALUE "ProductName", "Ryzom"
+            VALUE "ProductName", "Ryzom Core"
-            VALUE "ProductVersion", "2.1.0"
+            VALUE "ProductVersion", NL_VERSION
         END
     END
     BLOCK "VarFileInfo"

code/ryzom/client/src/client_cfg.cpp

@@ -39,7 +39,6 @@
 #include "nel/3d/u_scene.h"
 // Game Share.
 #include "game_share/time_weather_season/time_and_season.h"
-#include "game_share/ryzom_version.h"
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"

code/ryzom/client/src/commands.cpp

@@ -46,7 +46,6 @@
 #include "game_share/generic_xml_msg_mngr.h"
 #include "game_share/visual_slot_manager.h"
 #include "game_share/mode_and_behaviour.h"
-#include "game_share/ryzom_version.h"
 #include "game_share/brick_types.h"
 #include "game_share/time_weather_season/time_and_season.h"
 
@@ -101,6 +100,10 @@
 #include "zone_util.h"
 #include "nel/gui/lua_manager.h"
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 
 //
 // Only the define FINAL_VERSION can be defined on the project, not in this file

code/ryzom/client/src/init.cpp

@@ -1060,26 +1060,42 @@ void prelogInit()
 
 #if defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
 		// add all existing icons
-		vector<string> filenames;
+		vector<string> directories;
-		filenames.push_back("/usr/share/icons/hicolor/128x128/apps/ryzom.png");
+
-		filenames.push_back("/usr/share/icons/hicolor/48x48/apps/ryzom.png");
+		// system directories
-		filenames.push_back("/usr/share/icons/hicolor/32x32/apps/ryzom.png");
+		directories.push_back("/usr/share/icons/hicolor/256x256/apps");
-		filenames.push_back("/usr/share/icons/hicolor/24x24/apps/ryzom.png");
+		directories.push_back("/usr/share/icons/hicolor/128x128/apps");
-		filenames.push_back("/usr/share/icons/hicolor/22x22/apps/ryzom.png");
+		directories.push_back("/usr/share/icons/hicolor/96x96/apps");
-		filenames.push_back("/usr/share/icons/hicolor/16x16/apps/ryzom.png");
+		directories.push_back("/usr/share/icons/hicolor/48x48/apps");
-		filenames.push_back("/usr/share/pixmaps/ryzom.png");
+		directories.push_back("/usr/share/icons/hicolor/32x32/apps");
+		directories.push_back("/usr/share/icons/hicolor/24x24/apps");
+		directories.push_back("/usr/share/icons/hicolor/22x22/apps");
+		directories.push_back("/usr/share/icons/hicolor/16x16/apps");
+		directories.push_back("/usr/share/pixmaps");
+
+		// local directories
+		directories.push_back("~/.local/share/icons/hicolor/256x256/apps");
+		directories.push_back("~/.local/share/icons/hicolor/128x128/apps");
+		directories.push_back("~/.local/share/icons/hicolor/96x96/apps");
+		directories.push_back("~/.local/share/icons/hicolor/48x48/apps");
+		directories.push_back("~/.local/share/icons/hicolor/32x32/apps");
+		directories.push_back("~/.local/share/icons/hicolor/24x24/apps");
+		directories.push_back("~/.local/share/icons/hicolor/22x22/apps");
+		directories.push_back("~/.local/share/icons/hicolor/16x16/apps");
+		directories.push_back("~/.local/share/pixmaps");
 
 		// check if an icon is present in registered paths
-		if(CPath::exists("ryzom.png"))
+		directories.push_back(".");
-			filenames.push_back(CPath::lookup("ryzom.png"));
 
 		vector<CBitmap> bitmaps;
 
-		for(size_t i = 0; i < filenames.size(); ++i)
+		for(size_t i = 0; i < directories.size(); ++i)
 		{
+			std::string filename = NLMISC::toString("%s/%s.png", directories[i].c_str(), RYZOM_CLIENT_ICON);
+
 			CIFile file;
 
-			if (CFile::fileExists(filenames[i]) && file.open(filenames[i]))
+			if (CFile::fileExists(filename) && file.open(filename))
 			{
 				CBitmap bitmap;
 				if (bitmap.load(file))

code/ryzom/client/src/user_agent.cpp

@@ -20,10 +20,8 @@
 #include "user_agent.h"
 #include "client_cfg.h"
 
-#include "game_share/ryzom_version.h"
+#ifdef HAVE_CONFIG_H
-
+#include "config.h"
-#ifdef HAVE_REVISION_H
-#include "revision.h"
 #endif
 
 #if defined(HAVE_X86_64)
@@ -61,11 +59,7 @@ std::string getUserAgentVersion()
 
 	if (s_userAgent.empty())
 	{
-#ifdef REVISION
-		s_userAgent = NLMISC::toString("%s.%s-%s-%s", RYZOM_VERSION, REVISION, RYZOM_SYSTEM, RYZOM_ARCH);
-#else
 		s_userAgent = NLMISC::toString("%s-%s-%s", RYZOM_VERSION, RYZOM_SYSTEM, RYZOM_ARCH);
-#endif
 	}
 
 	return s_userAgent;
@@ -90,10 +84,6 @@ std::string getDisplayVersion()
 		if (ClientCfg.ExtendedCommands) s_version += "_E";
 
 		s_version += getVersion();
-
-#ifdef REVISION
-		s_version += NLMISC::toString(".%s", REVISION);
-#endif
 	}
 
 	return s_version;

code/ryzom/client/unix/CMakeLists.txt

@@ -3,9 +3,9 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/ryzom_client.desktop.in" "${CMAKE_CU
 INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.desktop" DESTINATION share/applications)
 INSTALL(FILES ryzom_client.png DESTINATION share/pixmaps)
 INSTALL(FILES ryzom_client.xpm DESTINATION share/pixmaps)
-INSTALL(FILES ryzom_16x16.png DESTINATION share/icons/hicolor/16x16/apps RENAME ryzom_client.png)
+INSTALL(FILES ryzom_16x16.png DESTINATION share/icons/hicolor/16x16/apps RENAME ${RYZOM_CLIENT_ICON}.png)
-INSTALL(FILES ryzom_22x22.png DESTINATION share/icons/hicolor/22x22/apps RENAME ryzom_client.png)
+INSTALL(FILES ryzom_22x22.png DESTINATION share/icons/hicolor/22x22/apps RENAME ${RYZOM_CLIENT_ICON}.png)
-INSTALL(FILES ryzom_24x24.png DESTINATION share/icons/hicolor/24x24/apps RENAME ryzom_client.png)
+INSTALL(FILES ryzom_24x24.png DESTINATION share/icons/hicolor/24x24/apps RENAME ${RYZOM_CLIENT_ICON}.png)
-INSTALL(FILES ryzom_32x32.png DESTINATION share/icons/hicolor/32x32/apps RENAME ryzom_client.png)
+INSTALL(FILES ryzom_32x32.png DESTINATION share/icons/hicolor/32x32/apps RENAME ${RYZOM_CLIENT_ICON}.png)
-INSTALL(FILES ryzom_48x48.png DESTINATION share/icons/hicolor/48x48/apps RENAME ryzom_client.png)
+INSTALL(FILES ryzom_48x48.png DESTINATION share/icons/hicolor/48x48/apps RENAME ${RYZOM_CLIENT_ICON}.png)
-INSTALL(FILES ryzom_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME ryzom_client.png)
+INSTALL(FILES ryzom_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME ${RYZOM_CLIENT_ICON}.png)

code/ryzom/client/unix/ryzom_client.desktop.in

@@ -8,7 +8,7 @@ Comment=Ryzom client
 Comment[fr_FR]=Client Ryzom
 TryExec=${RYZOM_GAMES_PREFIX}/ryzom_client
 Exec=${RYZOM_GAMES_PREFIX}/ryzom_client
-Icon=ryzom_client
+Icon=${RYZOM_CLIENT_ICON}
 Terminal=false
 Hidden=false
 Categories=Game;RolePlaying;

code/ryzom/tools/client/client_data_check/ReadMe.txt

@@ -1,88 +0,0 @@
-========================================================================
-       MICROSOFT FOUNDATION CLASS LIBRARY : client_data_check
-========================================================================
-
-
-AppWizard has created this client_data_check application for you.  This application
-not only demonstrates the basics of using the Microsoft Foundation classes
-but is also a starting point for writing your application.
-
-This file contains a summary of what you will find in each of the files that
-make up your client_data_check application.
-
-client_data_check.dsp
-    This file (the project file) contains information at the project level and
-    is used to build a single project or subproject. Other users can share the
-    project (.dsp) file, but they should export the makefiles locally.
-
-client_data_check.h
-    This is the main header file for the application.  It includes other
-    project specific headers (including Resource.h) and declares the
-    CClient_data_checkApp application class.
-
-client_data_check.cpp
-    This is the main application source file that contains the application
-    class CClient_data_checkApp.
-
-client_data_check.rc
-    This is a listing of all of the Microsoft Windows resources that the
-    program uses.  It includes the icons, bitmaps, and cursors that are stored
-    in the RES subdirectory.  This file can be directly edited in Microsoft
-	Visual C++.
-
-client_data_check.clw
-    This file contains information used by ClassWizard to edit existing
-    classes or add new classes.  ClassWizard also uses this file to store
-    information needed to create and edit message maps and dialog data
-    maps and to create prototype member functions.
-
-res\client_data_check.ico
-    This is an icon file, which is used as the application's icon.  This
-    icon is included by the main resource file client_data_check.rc.
-
-res\client_data_check.rc2
-    This file contains resources that are not edited by Microsoft 
-	Visual C++.  You should place all resources not editable by
-	the resource editor in this file.
-
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-
-AppWizard creates one dialog class:
-
-client_data_checkDlg.h, client_data_checkDlg.cpp - the dialog
-    These files contain your CClient_data_checkDlg class.  This class defines
-    the behavior of your application's main dialog.  The dialog's
-    template is in client_data_check.rc, which can be edited in Microsoft
-	Visual C++.
-
-
-/////////////////////////////////////////////////////////////////////////////
-Other standard files:
-
-StdAfx.h, StdAfx.cpp
-    These files are used to build a precompiled header (PCH) file
-    named client_data_check.pch and a precompiled types file named StdAfx.obj.
-
-Resource.h
-    This is the standard header file, which defines new resource IDs.
-    Microsoft Visual C++ reads and updates this file.
-
-/////////////////////////////////////////////////////////////////////////////
-Other notes:
-
-AppWizard uses "TODO:" to indicate parts of the source code you
-should add to or customize.
-
-If your application uses MFC in a shared DLL, and your application is 
-in a language other than the operating system's current language, you
-will need to copy the corresponding localized resources MFC42XXX.DLL
-from the Microsoft Visual C++ CD-ROM onto the system or system32 directory,
-and rename it to be MFCLOC.DLL.  ("XXX" stands for the language abbreviation.
-For example, MFC42DEU.DLL contains resources translated to German.)  If you
-don't do this, some of the UI elements of your application will remain in the
-language of the operating system.
-
-/////////////////////////////////////////////////////////////////////////////

code/ryzom/tools/patch_gen/patch_gen_service.cpp

@@ -19,7 +19,10 @@
 #include "nel/misc/common.h"
 #include "nel/misc/file.h"
 
-#include "game_share/ryzom_version.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "game_share/tick_event_handler.h"
 #include "game_share/singleton_registry.h"
 

code/ryzom/tools/sheets_packer/sheets_packer.cpp

@@ -30,9 +30,6 @@
 #include <shellapi.h>
 #endif
 
-// game share
-#include "game_share/ryzom_version.h"
-
 // Client
 #include "sheets_packer_init.h"
 

code/ryzom/tools/stats_scan/service_main.cpp

@@ -21,7 +21,10 @@
 
 #include "nel/net/service.h"
 
-#include "game_share/ryzom_version.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "game_share/tick_event_handler.h"
 #include "game_share/singleton_registry.h"