Merge from Git repository

--HG--
branch : develop

code/CMakeModules/ConfigureChecks.cmake

@@ -37,15 +37,25 @@ MACRO(NL_CONFIGURE_CHECKS)
     SET(RYZOM_VERSION_PATCH ${NL_VERSION_PATCH})
   ENDIF()
 
+  IF(DESCRIBE)
+    SET(NL_VERSION "${DESCRIBE}")
+  ELSE()
     SET(NL_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}.${REVISION}")
+  ENDIF()
   SET(NL_VERSION_RC "${NL_VERSION_MAJOR},${NL_VERSION_MINOR},${NL_VERSION_PATCH},${REVISION}")
+  SET(NL_PRODUCT_VERSION "${NL_VERSION_MAJOR}.${NL_VERSION_MINOR}.${NL_VERSION_PATCH}")
 
   SET(RYZOM_VERSION_SHORT "${RYZOM_VERSION_MAJOR}.${RYZOM_VERSION_MINOR}.${RYZOM_VERSION_PATCH}")
+  IF(DESCRIBE)
+    SET(RYZOM_VERSION "${DESCRIBE}")
+  ELSE()
     SET(RYZOM_VERSION "${RYZOM_VERSION_SHORT}.${REVISION}")
+  ENDIF()
   SET(RYZOM_VERSION_RC "${RYZOM_VERSION_MAJOR},${RYZOM_VERSION_MINOR},${RYZOM_VERSION_PATCH},${REVISION}")
+  SET(RYZOM_PRODUCT_VERSION "${RYZOM_VERSION_MAJOR}.${RYZOM_VERSION_MINOR}.${RYZOM_VERSION_PATCH}")
   NOW(BUILD_DATE)
 
-  SET(COPYRIGHT "${YEAR} ${AUTHOR}")
+  SET(COPYRIGHT "Copyright (C) ${YEAR} ${AUTHOR}")
 
   IF(NOT RYZOM_CLIENT_ICON)
     SET(RYZOM_CLIENT_ICON "ryzom_client")

code/CMakeModules/GetRevision.cmake

@@ -81,26 +81,38 @@ IF(EXISTS "${ROOT_DIR}/.git/")
       RESULT_VARIABLE git_exit_code
       OUTPUT_VARIABLE REVISION)
     IF(NOT ${git_exit_code} EQUAL 0)
-      message(WARNING "git rev-list failed, unable to include version.")
+      MESSAGE(WARNING "git rev-list failed, unable to include version.")
+    ELSE()
+      STRING(STRIP ${REVISION} REVISION)
     ENDIF()
     EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --short=8 HEAD
       WORKING_DIRECTORY ${ROOT_DIR}
       RESULT_VARIABLE git_exit_code
       OUTPUT_VARIABLE CHANGESET)
     IF(NOT ${git_exit_code} EQUAL 0)
-      message(WARNING "git rev-parse failed, unable to include version.")
+      MESSAGE(WARNING "git rev-parse failed, unable to include version.")
+    ELSE()
+      STRING(STRIP ${CHANGESET} CHANGESET)
     ENDIF()
     EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
       WORKING_DIRECTORY ${ROOT_DIR}
       RESULT_VARIABLE git_exit_code
       OUTPUT_VARIABLE BRANCH)
     IF(NOT ${git_exit_code} EQUAL 0)
-      message(WARNING "git rev-parse failed, unable to include git branch.")
+      MESSAGE(WARNING "git rev-parse failed, unable to include git branch.")
-    ENDIF()
+    ELSE()
-    STRING(STRIP ${REVISION} REVISION)
-    STRING(STRIP ${CHANGESET} CHANGESET)
       STRING(STRIP ${BRANCH} BRANCH)
     ENDIF()
+    EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe
+      WORKING_DIRECTORY ${ROOT_DIR}
+      RESULT_VARIABLE git_exit_code
+      OUTPUT_VARIABLE DESCRIBE)
+    IF(NOT ${git_exit_code} EQUAL 0)
+      MESSAGE(WARNING "git rev-parse failed, unable to include git branch.")
+    ELSE()
+      STRING(STRIP ${DESCRIBE} DESCRIBE)
+    ENDIF()
+  ENDIF()
 ENDIF()
 
 # if processing exported sources, use "revision" file if exists

code/config.h.cmake

@@ -27,9 +27,12 @@
 
 #cmakedefine NL_VERSION "${NL_VERSION}"
 #cmakedefine NL_VERSION_RC ${NL_VERSION_RC}
+#cmakedefine NL_PRODUCT_VERSION "${NL_PRODUCT_VERSION}"
 
 #cmakedefine RYZOM_VERSION "${RYZOM_VERSION}"
 #cmakedefine RYZOM_VERSION_RC ${RYZOM_VERSION_RC}
+#cmakedefine RYZOM_PRODUCT_VERSION "${RYZOM_PRODUCT_VERSION}"
+
 #cmakedefine AUTHOR "${AUTHOR}"
 #cmakedefine YEAR "${YEAR}"
 #cmakedefine COPYRIGHT "${COPYRIGHT}"

code/nel/include/nel/misc/version_nl.cmake

@@ -2,6 +2,7 @@
 #define NL_VERSION_H
 
 #define NL_VERSION "${NL_VERSION}"
+#define NL_PRODUCT_VERSION "${NL_PRODUCT_VERSION}"
 #define NL_VERSION_MAJOR ${NL_VERSION_MAJOR}
 #define NL_VERSION_MINOR ${NL_VERSION_MINOR}
 #define NL_VERSION_PATCH ${NL_VERSION_PATCH}

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

@@ -27,11 +27,11 @@ BEGIN
             VALUE "OriginalFilename", "nel_drv_direct3d_win_r.dll"
 #endif			
             VALUE "ProductName", "Ryzom Core"
-            VALUE "ProductVersion", NL_VERSION
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1252
+        VALUE "Translation", 0x9, 1200
     END
 END

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

@@ -27,11 +27,11 @@ BEGIN
             VALUE "OriginalFilename", "nel_drv_opengl_win_r.dll"
 #endif			
             VALUE "ProductName", "Ryzom Core"
-            VALUE "ProductVersion", NL_VERSION
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1252
+        VALUE "Translation", 0x9, 1200
     END
 END

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

@@ -27,11 +27,11 @@ BEGIN
             VALUE "OriginalFilename", "nel_drv_opengles_win_r.dll"
 #endif			
             VALUE "ProductName", "Ryzom Core"
-            VALUE "ProductVersion", NL_VERSION
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1252
+        VALUE "Translation", 0x9, 1200
     END
 END

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

@@ -27,11 +27,11 @@ BEGIN
             VALUE "OriginalFilename", "nel_drv_dsound_win_r.dll"
 #endif			
             VALUE "ProductName", "Ryzom Core"
-            VALUE "ProductVersion", NL_VERSION
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1252
+        VALUE "Translation", 0x9, 1200
     END
 END

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

@@ -27,11 +27,11 @@ BEGIN
             VALUE "OriginalFilename", "nel_drv_fmod_win_r.dll"
 #endif			
             VALUE "ProductName", "Ryzom Core"
-            VALUE "ProductVersion", NL_VERSION
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1252
+        VALUE "Translation", 0x9, 1200
     END
 END

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

@@ -27,11 +27,11 @@ BEGIN
             VALUE "OriginalFilename", "nel_drv_openal_win_r.dll"
 #endif			
             VALUE "ProductName", "Ryzom Core"
-            VALUE "ProductVersion", NL_VERSION
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1252
+        VALUE "Translation", 0x9, 1200
     END
 END

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

@@ -27,11 +27,11 @@ BEGIN
             VALUE "OriginalFilename", "nel_drv_xaudio2_win_r.dll"
 #endif			
             VALUE "ProductName", "Ryzom Core"
-            VALUE "ProductVersion", NL_VERSION
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1252
+        VALUE "Translation", 0x9, 1200
     END
 END

code/nel/tools/3d/anim_builder/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Anim Builder"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "anim_builder" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

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

@@ -1,9 +1,11 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(animation_set_builder ${SRC})
 
 TARGET_LINK_LIBRARIES(animation_set_builder nel3d nelmisc)
-NL_DEFAULT_PROPS(animation_set_builder "NeL, Tools, 3D: anim_set_builder")
+NL_DEFAULT_PROPS(animation_set_builder "NeL, Tools, 3D: Animation Set Builder")
 NL_ADD_RUNTIME_FLAGS(animation_set_builder)
 
 INSTALL(TARGETS animation_set_builder RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)

code/nel/tools/3d/animation_set_builder/main.rc

@@ -0,0 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
+IDI_MAIN_ICON ICON DISCARDABLE "gold_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Animation Set Builder"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "animation_set_builder" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

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

@@ -1,4 +1,4 @@
-FILE(GLOB SRC *.cpp *.h *.rc)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
 
 SOURCE_GROUP("" FILES ${SRC})
 

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

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(cluster_viewer WIN32 ${SRC})
 

code/nel/tools/3d/cluster_viewer/main.rc

@@ -0,0 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
+IDI_MAIN_ICON ICON DISCARDABLE "red_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Cluster Viewer"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "cluster_viewer" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/get_neighbors/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Get Neighbors"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "get_neighbors" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/hls_bank_maker/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL HLS Bank Maker"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "hls_bank_maker" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/ig_add/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL IG Add"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "ig_add" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/ig_elevation/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL IG Elevation"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "ig_elevation" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/ig_lighter/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL IG Lighter"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "ig_lighter" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/lightmap_optimizer/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Lightmap Optimizer"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "lightmap_optimizer" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/ligo/plugin_max/CMakeLists.txt

@@ -1,6 +1,8 @@
-FILE(GLOB SRC *.cpp *.h ../../ig_lighter_lib/*.cpp ../../ig_lighter_lib/*.h)
+FILE(GLOB SRC *.cpp *.h ../../ig_lighter_lib/*.cpp ../../ig_lighter_lib/*.h *.rc *.rc2 *.def)
 
-ADD_LIBRARY(ligoscape_utility SHARED ligoscape_utility.rc ${SRC} ligoscape_utility.def)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_LIBRARY(ligoscape_utility SHARED ${SRC})
 
 INCLUDE_DIRECTORIES(${MAXSDK_INCLUDE_DIR})
 

code/nel/tools/3d/ligo/plugin_max/ligoscape_utility.rc

@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
 
@@ -7,19 +7,17 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "windows.h"
+#include "afxres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
-#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -27,76 +25,32 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE 
 BEGIN
-    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
 #endif    // APSTUDIO_INVOKED
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,0,0
- PRODUCTVERSION 3,0,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "\0"
-            VALUE "FileVersion", "3.0.0.0\0"
-            VALUE "InternalName", "Ligoscape\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "OriginalFilename", "Ligoscape.dlu\0"
-            VALUE "ProductName", "3D Studio MAX\0"
-            VALUE "ProductVersion", "3.0.0.0\0"
-            VALUE "FileDescription", "NeL Ligoscape utility\0"
-            VALUE "Comments", "TECH: \0"
-            VALUE "LegalTrademarks", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table
 //
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     IDS_LIBDESCRIPTION      "NeL Ligoscape utility"
     IDS_CATEGORY            "NeL Tools"
@@ -105,7 +59,7 @@ BEGIN
     IDS_SPIN                "Spin"
 END
 
-#endif    // English (U.S.) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -115,7 +69,7 @@ END
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
+#include "version.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

code/nel/tools/3d/ligo/plugin_max/version.rc2

@@ -0,0 +1,55 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+#include "maxversion.h"
+#define STRINGIFY_(x) #x
+#define STRINGIFY(x) STRINGIFY_(x)
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT "_r"
+#endif
+
+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 "Comments", "NeL is provided under the AGPLv3 with a linking exception for the 3ds Max SDK"
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Ligoscape utility"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT ". Copyright (C) 2000 Nevrax Ltd."
+            VALUE "OriginalFilename", "nelligoscapeutility" NL_FILEEXT ".dlx"
+            VALUE "ProductName", "NeL Plugins for 3ds Max " STRINGIFY(MAX_PRODUCT_YEAR_NUMBER)
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

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

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Mesh Export"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "mesh_export" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

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

@@ -1,6 +1,8 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
 
-ADD_LIBRARY(object_viewer_dll SHARED ${SRC} object_viewer.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_LIBRARY(object_viewer_dll SHARED ${SRC})
 
 TARGET_LINK_LIBRARIES(object_viewer_dll 
 							nelmisc

code/nel/tools/3d/object_viewer/object_viewer.rc

@@ -13,11 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -259,19 +259,6 @@ BEGIN
                             "No views were selected ! No snapshot will be taken."
 END
 
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Bitmap
@@ -2567,58 +2554,14 @@ BEGIN
     "#include ""res\\object_viewer.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
     "#include ""l.fra\\afxres.rc""          // Standard components\r\n"
     "#endif\r\n"
+    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
 #endif    // APSTUDIO_INVOKED
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,103
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040c04b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "object_viewer DLL\0"
-            VALUE "FileVersion", "1, 0, 0, 103\0"
-            VALUE "InternalName", "object_viewer\0"
-            VALUE "LegalCopyright", "Copyright (C) 2001\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "object_viewer.DLL\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Bibliothèque de liaison dynamique object_viewer\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x40c, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Menu
@@ -3248,35 +3191,6 @@ BEGIN
     0
 END
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDR_MAINFRAME           "Toto"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_SHOOT_SCENE          "Shoot the scene in a movie"
-END
-
-#endif    // French (France) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (Belgium) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRB)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN
-#pragma code_page(1252)
-#endif //_WIN32
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
@@ -3323,7 +3237,7 @@ BEGIN
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // French (Belgium) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -3347,6 +3261,8 @@ LANGUAGE 12, 1
 #include "l.fra\afxres.rc"          // Standard components
 #endif
 
+#include "version.rc2"
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 

code/nel/tools/3d/object_viewer/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT "_r"
+#endif
+
+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 "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Object Viewer dynamic library"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "object_viewer" NL_FILEEXT ".dll"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

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

@@ -1,9 +1,11 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ENABLE_LANGUAGE(RC)
 ADD_DEFINITIONS(${MFC_DEFINITIONS})
 SET(CMAKE_MFC_FLAG 2)
-ADD_EXECUTABLE(object_viewer WIN32 ${SRC} object_viewer_exe.rc)
+ADD_EXECUTABLE(object_viewer WIN32 ${SRC})
 
 TARGET_LINK_LIBRARIES(	object_viewer 
 						nelmisc 

code/nel/tools/3d/object_viewer_exe/object_viewer_exe.rc

@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
 
@@ -7,19 +7,17 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include <windows.h>
+#include "afxres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -28,19 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_MAIN_ICON           ICON    DISCARDABLE     "nevraxpill.ico"
+IDI_MAIN_ICON           ICON                    "nevraxpill.ico"
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -48,26 +35,26 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE 
 BEGIN
-    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // French (France) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -77,7 +64,7 @@ END
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
+#include "version.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

code/nel/tools/3d/object_viewer_exe/resource.h

@@ -1,21 +1,5 @@
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
+// Microsoft Visual C++ generated include file.
 // Used by object_viewer_exe.rc
 //
 #define IDI_ICON1                       101

code/nel/tools/3d/object_viewer_exe/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Object Viewer"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "object_viewer" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/3d/panoply_maker/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Panoply Maker"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "panoply_maker" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/panoply_preview/icon.rc

@@ -1 +0,0 @@
-IDI_ICON1   ICON  DISCARDABLE  "greenpill.ico"

code/nel/tools/3d/panoply_preview/main.rc

@@ -0,0 +1,43 @@
+
+#include <windows.h>
+#include "config.h"
+
+IDI_ICON1 ICON DISCARDABLE "green_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Panoply Preview"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "nl_panoply_preview" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/plugin_max/nel_3dsmax_shared/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h *.def)
+FILE(GLOB SRC *.cpp *.h *.def *.rc *.rc2)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_LIBRARY(nel_3dsmax_shared SHARED ${SRC})
 
@@ -11,7 +13,7 @@ TARGET_LINK_LIBRARIES(nel_3dsmax_shared
 							${MAXSDK_LIBRARIES} 
 							Version.lib)
 							
-NL_DEFAULT_PROPS(nel_3dsmax_shared "MAX Plugin: NeL 3DSMAX Shared")
+NL_DEFAULT_PROPS(nel_3dsmax_shared "MAX Plugin: NeL 3ds Max Shared")
 NL_ADD_RUNTIME_FLAGS(nel_3dsmax_shared)
 NL_ADD_LIB_SUFFIX(nel_3dsmax_shared)
 #SET_TARGET_PROPERTIES(nel_export PROPERTIES SUFFIX ".dlx")

code/nel/tools/3d/plugin_max/nel_3dsmax_shared/resource.h

@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by nel_3dsmax_shared.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

code/nel/tools/3d/plugin_max/nel_3dsmax_shared/version.rc2

@@ -0,0 +1,55 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+#include "maxversion.h"
+#define STRINGIFY_(x) #x
+#define STRINGIFY(x) STRINGIFY_(x)
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT "_r"
+#endif
+
+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 "Comments", "NeL is provided under the AGPLv3 with a linking exception for the 3ds Max SDK"
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL shared library for 3ds Max"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT ". Copyright (C) 2000 Nevrax Ltd."
+            VALUE "OriginalFilename", "nel_3dsmax_shared" NL_FILEEXT ".dll"
+            VALUE "ProductName", "NeL Plugins for 3ds Max " STRINGIFY(MAX_PRODUCT_YEAR_NUMBER)
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/3d/plugin_max/nel_export/nel_export.rc

@@ -13,11 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -452,51 +452,13 @@ END
 
 3 TEXTINCLUDE
 BEGIN
-    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
 #endif    // APSTUDIO_INVOKED
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 12, 0, 0
- PRODUCTVERSION 0, 12, 0, 0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample"
-            VALUE "CompanyName", "Ryzom Core"
-            VALUE "FileVersion", "0.12.0\0"
-            VALUE "InternalName", "CNelExport"
-            VALUE "OriginalFilename", "CNelExport.dlu"
-            VALUE "ProductName", "Ryzom Core"
-            VALUE "ProductVersion", "0.12.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table
@@ -511,19 +473,6 @@ BEGIN
     IDS_SPIN                "Spin"
 END
 
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
@@ -716,7 +665,7 @@ BEGIN
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // French (France) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -726,7 +675,7 @@ END
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
+#include "version.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

code/nel/tools/3d/plugin_max/nel_export/version.rc2

@@ -0,0 +1,55 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+#include "maxversion.h"
+#define STRINGIFY_(x) #x
+#define STRINGIFY(x) STRINGIFY_(x)
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT "_r"
+#endif
+
+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 "Comments", "NeL is provided under the AGPLv3 with a linking exception for the 3ds Max SDK. Based on Kinetix 3D Studio Max 3.0 plugin sample"
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Export"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT ". Copyright (C) 2000 Nevrax Ltd."
+            VALUE "OriginalFilename", "nelexport" NL_FILEEXT ".dlm"
+            VALUE "ProductName", "NeL Plugins for 3ds Max " STRINGIFY(MAX_PRODUCT_YEAR_NUMBER)
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/3d/plugin_max/nel_patch_converter/CMakeLists.txt

@@ -1,6 +1,8 @@
-FILE(GLOB SRC *.cpp *.h *.def)
+FILE(GLOB SRC *.cpp *.h *.def *.rc *.rc2)
 
-ADD_LIBRARY(nel_patch_converter SHARED ${SRC} nel_patch_converter.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_LIBRARY(nel_patch_converter SHARED ${SRC})
 
 INCLUDE_DIRECTORIES(${MAXSDK_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nel_patch_converter

code/nel/tools/3d/plugin_max/nel_patch_converter/nel_patch_converter.rc

@@ -13,11 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -72,52 +72,13 @@ END
 
 3 TEXTINCLUDE
 BEGIN
-    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
 #endif    // APSTUDIO_INVOKED
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 12, 0, 0
- PRODUCTVERSION 0, 12, 0, 0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "http://www.ryzomcore.org/"
-            VALUE "FileDescription", "PatchMesh to RykolPatchMesh"
-            VALUE "FileVersion", "0.12.0"
-            VALUE "InternalName", "PatchMesh to RykolPatchMesh"
-            VALUE "LegalCopyright", "Copyright, 2000 Nevrax Ltd."
-            VALUE "OriginalFilename", "nel_convert_patch.dlm"
-            VALUE "ProductName", "NeL Patch Converter"
-            VALUE "ProductVersion", "0.12.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table
@@ -132,7 +93,7 @@ BEGIN
     IDS_SPIN                "Spin"
 END
 
-#endif    // English (U.S.) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -142,7 +103,7 @@ END
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
+#include "version.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

code/nel/tools/3d/plugin_max/nel_patch_converter/version.rc2

@@ -0,0 +1,55 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+#include "maxversion.h"
+#define STRINGIFY_(x) #x
+#define STRINGIFY(x) STRINGIFY_(x)
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT "_r"
+#endif
+
+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 "Comments", "NeL is provided under the AGPLv3 with a linking exception for the 3ds Max SDK"
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Patch Converter: PatchMesh to RykolPatchMesh"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT ". Copyright (C) 2000 Nevrax Ltd."
+            VALUE "OriginalFilename", "nelconvertpatch" NL_FILEEXT ".dlm"
+            VALUE "ProductName", "NeL Plugins for 3ds Max " STRINGIFY(MAX_PRODUCT_YEAR_NUMBER)
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/3d/plugin_max/nel_patch_edit/CMakeLists.txt

@@ -1,6 +1,8 @@
-FILE(GLOB SRC *.cpp *.h *.def)
+FILE(GLOB SRC *.cpp *.h *.def *.rc *.rc2)
 
-ADD_LIBRARY(nel_patch_edit SHARED ${SRC} mods.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_LIBRARY(nel_patch_edit SHARED ${SRC})
 
 INCLUDE_DIRECTORIES(${MAXSDK_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(nel_patch_edit 

code/nel/tools/3d/plugin_max/nel_patch_edit/mods.rc

@@ -16,11 +16,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -361,7 +361,7 @@ END
 
 3 TEXTINCLUDE
 BEGIN
-    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -508,47 +508,6 @@ END
 #endif    // APSTUDIO_INVOKED
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 12, 0, 0
- PRODUCTVERSION 0, 12, 0, 0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
-            VALUE "CompanyName", "Ryzom Core"
-            VALUE "FileDescription", "NeL Patch Edit"
-            VALUE "FileVersion", "0.12.0"
-            VALUE "InternalName", "neleditpatch"
-            VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc."
-            VALUE "LegalTrademarks", "The following are registered trademarks of Autodesk, Inc.: 3D Studio MAX.  The following are trademarks of Autodesk, Inc.: Kinetix, Kinetix(logo), BIPED, Physique, Character Studio, MAX DWG, DWG Unplugged, Heidi, FLI, FLC, DXF."
-            VALUE "OriginalFilename", "neleditpatch.dlm"
-            VALUE "ProductName", "Ryzom Core"
-            VALUE "ProductVersion", "0.12.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
@@ -1277,19 +1236,6 @@ BEGIN
     IDS_PW_INSTANCEERROR    "Error UVW Unwrap cannot be instanced please make it unique"
 END
 
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Cursor
@@ -1298,7 +1244,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 IDC_PICK_COLOR          CURSOR                  "pick_color.cur"
 IDC_FILL                CURSOR                  "cursor1.cur"
 IDC_TRICK               CURSOR                  "cur00001.cur"
-#endif    // French (France) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -1308,7 +1254,7 @@ IDC_TRICK               CURSOR                  "cur00001.cur"
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
+#include "version.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

code/nel/tools/3d/plugin_max/nel_patch_edit/version.rc2

@@ -0,0 +1,55 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+#include "maxversion.h"
+#define STRINGIFY_(x) #x
+#define STRINGIFY(x) STRINGIFY_(x)
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT "_r"
+#endif
+
+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 "Comments", "NeL is provided under the AGPLv3 with a linking exception for the 3ds Max SDK. Based on Kinetix 3D Studio Max 3.0 plugin sample"
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Patch Edit"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT ". Copyright (C) 2000 Nevrax Ltd. Copyright (C) 1998 Autodesk Inc."
+            VALUE "OriginalFilename", "neleditpatch" NL_FILEEXT ".dlm"
+            VALUE "ProductName", "NeL Plugins for 3ds Max " STRINGIFY(MAX_PRODUCT_YEAR_NUMBER)
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt

@@ -1,8 +1,10 @@
-FILE(GLOB SRC *.cpp *.h *.def)
+FILE(GLOB SRC *.cpp *.h *.def *.rc *.rc2)
 
 LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/nel_paint.cpp)
 
-ADD_LIBRARY(nel_patch_paint SHARED ${SRC} nel_patch_paint.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_LIBRARY(nel_patch_paint SHARED ${SRC})
 
 INCLUDE_DIRECTORIES(${MAXSDK_INCLUDE_DIR})
 

code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.rc

@@ -20,7 +20,7 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -63,7 +63,7 @@ END
 
 3 TEXTINCLUDE DISCARDABLE
 BEGIN
-    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -89,65 +89,6 @@ END
 #endif    // APSTUDIO_INVOKED
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 12, 0, 0
- PRODUCTVERSION 0, 12, 0, 0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
-            VALUE "Comments", "TECH: cyril.corvazier\0"
-            VALUE "CompanyName", "Ryzom Core\0"
-            VALUE "FileDescription", "NeL Patch Paint\0"
-            VALUE "FileVersion", "0.12.0\0"
-            VALUE "InternalName", "mods\0"
-            VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "nelpatchpaint.dlm\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.12.0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Cursor
@@ -157,7 +98,7 @@ IDC_PICK_COLOR          CURSOR  DISCARDABLE     "pick_color.cur"
 IDC_FILL                CURSOR  DISCARDABLE     "cursor1.cur"
 IDC_TRICK               CURSOR  DISCARDABLE     "cur00001.cur"
 IDC_INSPECT             CURSOR  DISCARDABLE     "pick_col.cur"
-#endif    // French (France) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -167,7 +108,7 @@ IDC_INSPECT             CURSOR  DISCARDABLE     "pick_col.cur"
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
+#include "version.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

code/nel/tools/3d/plugin_max/nel_patch_paint/version.rc2

@@ -0,0 +1,55 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+#include "maxversion.h"
+#define STRINGIFY_(x) #x
+#define STRINGIFY(x) STRINGIFY_(x)
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT "_r"
+#endif
+
+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 "Comments", "NeL is provided under the AGPLv3 with a linking exception for the 3ds Max SDK. Based on Kinetix 3D Studio Max 3.0 plugin sample"
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Patch Paint"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT ". Copyright (C) 2000 Nevrax Ltd."
+            VALUE "OriginalFilename", "nelpaintpatch" NL_FILEEXT ".dlm"
+            VALUE "ProductName", "NeL Plugins for 3ds Max " STRINGIFY(MAX_PRODUCT_YEAR_NUMBER)
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/CMakeLists.txt

@@ -1,6 +1,8 @@
-FILE(GLOB SRC *.cpp *.h *.def)
+FILE(GLOB SRC *.cpp *.h *.def *.rc *.rc2)
 
-ADD_LIBRARY(nel_vertex_tree_paint SHARED ${SRC} vertex_tree_paint.def vertex_tree_paint.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_LIBRARY(nel_vertex_tree_paint SHARED ${SRC})
 
 INCLUDE_DIRECTORIES(${MAXSDK_INCLUDE_DIR})
 

code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/version.rc2

@@ -0,0 +1,55 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+#include "maxversion.h"
+#define STRINGIFY_(x) #x
+#define STRINGIFY(x) STRINGIFY_(x)
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT "_r"
+#endif
+
+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 "Comments", "NeL is provided under the AGPLv3 with a linking exception for the 3ds Max SDK. Based on Kinetix 3D Studio Max 3.1 plugin sample"
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Vertex Tree Paint"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT ". Copyright (C) 2000 Nevrax Ltd. Copyright (C) 1998 Autodesk Inc."
+            VALUE "OriginalFilename", "nel_vertex_tree_paint" NL_FILEEXT ".dlm"
+            VALUE "ProductName", "NeL Plugins for 3ds Max " STRINGIFY(MAX_PRODUCT_YEAR_NUMBER)
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/vertex_tree_paint.rc

@@ -13,11 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -103,7 +103,7 @@ END
 
 3 TEXTINCLUDE DISCARDABLE
 BEGIN
-    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -118,50 +118,6 @@ END
 IDC_PAINTCURSOR         CURSOR  DISCARDABLE     "paintcur.cur"
 IDC_DROPPER_CURSOR      CURSOR  DISCARDABLE     "dropcurs.cur"
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 12, 0, 0
- PRODUCTVERSION 0, 12, 0, 0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Based on Kinetix 3D Studio Max 3.1 plugin sample\0"
-            VALUE "Comments", "TECH: \0"
-            VALUE "CompanyName", "Ryzom Core\0"
-            VALUE "FileDescription", "Vertex Tree Paint\0"
-            VALUE "FileVersion", "0.12.0\0"
-            VALUE "InternalName", "VertexTreePaint\0"
-            VALUE "LegalCopyright", "Copyright © 2000 Nevrax Ltd. Copyright © 1998 Autodesk Inc.\0"
-            VALUE "LegalTrademarks", "The following are registered trademarks of Autodesk, Inc.: 3D Studio MAX.  The following are trademarks of Autodesk, Inc.: Kinetix, Kinetix(logo), BIPED, Physique, Character Studio, MAX DWG, DWG Unplugged, Heidi, FLI, FLC, DXF.\0"
-            VALUE "OriginalFilename", "nel_vertex_tree_paint.dlm\0"
-            VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.12.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -207,7 +163,7 @@ BEGIN
     IDS_RESTORE_GRADIENT    "Vertex Tree Gradient"
 END
 
-#endif    // English (U.S.) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -217,7 +173,7 @@ END
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
+#include "version.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

code/nel/tools/3d/plugin_max/tile_utility/CMakeLists.txt

@@ -1,6 +1,8 @@
-FILE(GLOB SRC *.cpp *.h *.def)
+FILE(GLOB SRC *.cpp *.h *.def *.rc *.rc2)
 
-ADD_LIBRARY(tile_utility SHARED ${SRC} tile_utility.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_LIBRARY(tile_utility SHARED ${SRC})
 
 INCLUDE_DIRECTORIES(${MAXSDK_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(tile_utility 

code/nel/tools/3d/plugin_max/tile_utility/tile_utility.rc

@@ -13,11 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -110,58 +110,13 @@ END
 
 3 TEXTINCLUDE DISCARDABLE
 BEGIN
-    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
 #endif    // APSTUDIO_INVOKED
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0, 12, 0, 0
- PRODUCTVERSION 0, 12, 0, 0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Based on Kinetix 3D Studio Max 3.0 plugin sample\0"
-            VALUE "CompanyName", "Ryzom Core\0"
-            VALUE "FileVersion", "0.12.0\0"
-            VALUE "InternalName", "Tile_utility\0"
-            VALUE "LegalCopyright", "\0"
-            VALUE "OriginalFilename", "Tile_utility.dlu\0"
-            VALUE "ProductName", "Ryzom Core\0"
-            VALUE "ProductVersion", "0.12.0\0"
-            VALUE "FileDescription", "Create material for tiles\0"
-            VALUE "Comments", "TECH: \0"
-            VALUE "LegalTrademarks", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table
@@ -704,7 +659,7 @@ BEGIN
     65509                   "Amount"
 END
 
-#endif    // English (U.S.) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -714,7 +669,7 @@ END
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
+#include "version.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

code/nel/tools/3d/plugin_max/tile_utility/version.rc2

@@ -0,0 +1,55 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+#include "maxversion.h"
+#define STRINGIFY_(x) #x
+#define STRINGIFY(x) STRINGIFY_(x)
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT "_r"
+#endif
+
+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 "Comments", "NeL is provided under the AGPLv3 with a linking exception for the 3ds Max SDK. Based on Kinetix 3D Studio Max 3.0 plugin sample"
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Tile Utility: Create material for tiles"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT ". Copyright (C) 2000 Nevrax Ltd."
+            VALUE "OriginalFilename", "neltileutility" NL_FILEEXT ".dlu"
+            VALUE "ProductName", "NeL Plugins for 3ds Max " STRINGIFY(MAX_PRODUCT_YEAR_NUMBER)
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/3d/shapes_exporter/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "gold_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Shapes Exporter"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "shapes_exporter" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/tga_2_dds/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL TGA to DDS"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "tga2dds" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/tga_cut/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL TGA Cut"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "tga_cut" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

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

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 FILE(GLOB SRC2 cpu.cpp DllEntry.cpp Popup.* thread_win32.* TileCtrl.* TileList.* TileView.*)
 LIST(REMOVE_ITEM SRC ${SRC2})

code/nel/tools/3d/tile_edit/tile_edit_exe.rc

@@ -13,11 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -91,50 +91,13 @@ END
 
 3 TEXTINCLUDE 
 BEGIN
-    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
 #endif    // APSTUDIO_INVOKED
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,6,0,0
- PRODUCTVERSION 0,6,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileVersion", "0.6.0.0"
-            VALUE "InternalName", "tile_edit_exe"
-            VALUE "OriginalFilename", "tile_edit.exe"
-            VALUE "ProductName", "NeL Tilebank Editor"
-            VALUE "ProductVersion", "0.6.0.0"
-			VALUE "Comments", "http://www.opennel.org/"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
@@ -156,19 +119,6 @@ BEGIN
     IDS_SPIN                "Spin"
 END
 
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
@@ -412,7 +362,7 @@ IDB_BITMAP2             BITMAP                  "rot0.bmp"
 IDB_BITMAP3             BITMAP                  "rot1.bmp"
 IDB_BITMAP4             BITMAP                  "rot2.bmp"
 IDB_BITMAP5             BITMAP                  "rot3.bmp"
-#endif    // French (France) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -422,7 +372,7 @@ IDB_BITMAP5             BITMAP                  "rot3.bmp"
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
+#include "version.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

code/nel/tools/3d/tile_edit/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Tilebank Editor"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "tile_edit" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/3d/unbuild_interface/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "gold_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Unbuild Interface"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "unbuild_interface" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/zone_dependencies/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Zone Dependencies"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "zone_dependencies" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/zone_ig_lighter/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Zone IG Lighter"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "zone_ig_lighter" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/zone_lighter/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Zone Lighter"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "zone_lighter" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/3d/zone_welder/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Zone Welder"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "zone_welder" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/logic/logic_editor_exe/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(logic_editor WIN32 ${SRC})
 

code/nel/tools/logic/logic_editor_exe/main.rc

@@ -0,0 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
+IDI_MAIN_ICON ICON DISCARDABLE "red_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Logic Editor"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "logic_editor" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/misc/bnp_make/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL BNP Make"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "bnp_make" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/misc/branch_patcher/CMakeLists.txt

@@ -1,6 +1,8 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
 
-ADD_EXECUTABLE(branch_patcher WIN32 ${SRC} branch_patcher.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_EXECUTABLE(branch_patcher WIN32 ${SRC})
 
 #TARGET_LINK_LIBRARIES(branch_patcher ${PLATFORM_LINKFLAGS})
 NL_DEFAULT_PROPS(branch_patcher "NeL, Tools, Misc: branch_patcher")

code/nel/tools/misc/branch_patcher/branch_patcher.rc

@@ -13,11 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -53,52 +53,6 @@ BEGIN
 END
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Nevrax\0"
-            VALUE "FileDescription", "branch_patcher MFC Application\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "branch_patcher\0"
-            VALUE "LegalCopyright", "Copyright (C) 2003\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "branch_patcher.EXE\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Nevrax Branch Patcher\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -115,22 +69,8 @@ BEGIN
         BOTTOMMARGIN, 274
     END
 END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
 
-#ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // TEXTINCLUDE
@@ -162,6 +102,8 @@ BEGIN
     "#include ""res\\branch_patcher.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
     "#include ""afxres.rc""         // Standard components\r\n"
     "#endif\r\n"
+    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -176,7 +118,7 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDR_MAINFRAME           ICON    DISCARDABLE     "res\\nevrax_pill_3d_rgba.ico"
-#endif    // French (France) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -200,6 +142,8 @@ LANGUAGE 9, 1
 #include "afxres.rc"         // Standard components
 #endif
 
+#include "version.rc2"
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 

code/nel/tools/misc/branch_patcher/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Branch Patcher"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "branch_patcher" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/misc/crash_report/crash_report.rc

@@ -3,6 +3,12 @@
 
 IDI_MAIN_ICON ICON DISCARDABLE "nevraxpill.ico"
 
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION NL_VERSION_RC
  PRODUCTVERSION NL_VERSION_RC
@@ -12,7 +18,7 @@ FILEFLAGS VS_FF_DEBUG
 #else
  FILEFLAGS 0x0L
 #endif
-FILEOS VOS__WINDOWS32
+ FILEOS VOS_NT_WINDOWS32
  FILETYPE VFT_APP
  FILESUBTYPE 0x0L
 BEGIN
@@ -20,16 +26,17 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "FileDescription", "Crash Report"
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Crash Report"
             VALUE "FileVersion", NL_VERSION
             VALUE "LegalCopyright", COPYRIGHT
-            VALUE "OriginalFilename", "crash_report.exe"
+            VALUE "OriginalFilename", "crash_report" NL_FILEEXT ".exe"
-            VALUE "ProductName", "Ryzom Core"
+            VALUE "ProductName", "NeL Tools"
-            VALUE "ProductVersion", NL_VERSION
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1252
+        VALUE "Translation", 0x9, 1200
     END
 END

code/nel/tools/misc/data_mirror/CMakeLists.txt

@@ -1,6 +1,8 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
 
-ADD_EXECUTABLE(data_mirror WIN32 ${SRC} data_mirror.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_EXECUTABLE(data_mirror WIN32 ${SRC})
 
 TARGET_LINK_LIBRARIES(data_mirror nelmisc)
 NL_DEFAULT_PROPS(data_mirror "NeL, Tools, Misc: data_mirror")

code/nel/tools/misc/data_mirror/data_mirror.rc

@@ -13,11 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -71,49 +71,6 @@ BEGIN
 END
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "data_mirror MFC Application\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "data_mirror\0"
-            VALUE "LegalCopyright", "Copyright (C) 2003\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "data_mirror.EXE\0"
-            VALUE "ProductName", "data_mirror Application\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -174,18 +131,6 @@ BEGIN
     IDS_NEW_DATE            "New Date"
 END
 
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -219,12 +164,14 @@ BEGIN
     "#include ""res\\data_mirror.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
     "#include ""afxres.rc""         // Standard components\r\n"
     "#endif\r\n"
+    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // French (France) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -248,6 +195,8 @@ LANGUAGE 9, 1
 #include "afxres.rc"         // Standard components
 #endif
 
+#include "version.rc2"
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 

code/nel/tools/misc/data_mirror/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Data Mirror"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "data_mirror" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/misc/exec_timeout/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "yellow_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Exec Timeout"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "exec_timeout" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/misc/log_analyser/CMakeLists.txt

@@ -1,6 +1,8 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
 
-ADD_EXECUTABLE(log_analyser WIN32 ${SRC} log_analyser.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_EXECUTABLE(log_analyser WIN32 ${SRC})
 
 TARGET_LINK_LIBRARIES(log_analyser nelmisc)
 NL_DEFAULT_PROPS(log_analyser "NeL, Tools, Misc: log_analyser")

code/nel/tools/misc/log_analyser/log_analyser.rc

@@ -13,11 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -109,52 +109,6 @@ BEGIN
 END
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,0,1
- PRODUCTVERSION 1,5,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Nevrax\0"
-            VALUE "FileDescription", "NeL Log Analyser\0"
-            VALUE "FileVersion", "1, 5, 0, 1\0"
-            VALUE "InternalName", "log_analyser\0"
-            VALUE "LegalCopyright", "Copyright (C) 2002-2003 Nevrax\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "NeL Log Analyser\0"
-            VALUE "ProductVersion", "1, 5, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -205,18 +159,6 @@ BEGIN
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -250,6 +192,8 @@ BEGIN
     "#include ""res\\log_analyser.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
     "#include ""afxres.rc""         // Standard components\r\n"
     "#endif\r\n"
+    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -264,7 +208,7 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDR_MAINFRAME           ICON    DISCARDABLE     "res\\log_analyser.ico"
-#endif    // French (France) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -288,6 +232,8 @@ LANGUAGE 9, 1
 #include "afxres.rc"         // Standard components
 #endif
 
+#include "version.rc2"
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 

code/nel/tools/misc/log_analyser/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Log Analyser"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "log_analyser" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/misc/make_sheet_id/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "blue_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Make Sheet ID"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "make_sheet_id" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/misc/message_box/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "yellow_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Message Box"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "message_box" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/misc/message_box_qt/main.rc

@@ -1 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
 IDI_MAIN_ICON ICON DISCARDABLE "yellow_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Message Box"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "message_box_qt" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/misc/multi_cd_setup_fix/CMakeLists.txt

@@ -1,6 +1,8 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
 
-ADD_EXECUTABLE(multi_cd_setup_fix WIN32 ${SRC} multi_cd_setup_fix.rc)
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_EXECUTABLE(multi_cd_setup_fix WIN32 ${SRC})
 
 #TARGET_LINK_LIBRARIES(multi_cd_setup_fix ${PLATFORM_LINKFLAGS})
 NL_DEFAULT_PROPS(multi_cd_setup_fix "NeL, Tools, Misc: multi_cd_setup_fix")

code/nel/tools/misc/multi_cd_setup_fix/multi_cd_setup_fix.rc

@@ -13,11 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// French (France) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
 #ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -49,7 +49,7 @@ END
 
 3 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -89,7 +89,7 @@ BEGIN
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // French (France) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -99,7 +99,7 @@ END
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-
+#include "version.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

code/nel/tools/misc/multi_cd_setup_fix/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Multi CD Setup Fix"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "multi_cd_setup_fix" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/misc/probe_timers/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(nl_probe_timers ${SRC})
 

code/nel/tools/misc/probe_timers/main.rc

@@ -0,0 +1,42 @@
+#include <windows.h>
+#include "config.h"
+
+IDI_MAIN_ICON ICON DISCARDABLE "gold_pill.ico"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Probe Timers"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "nl_probe_timers" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END

code/nel/tools/misc/words_dic/CMakeLists.txt

@@ -1,4 +1,6 @@
-FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB SRC *.cpp *.h *.rc *.rc2)
+
+SOURCE_GROUP("" FILES ${SRC})
 
 ADD_EXECUTABLE(words_dic WIN32 ${SRC} words_dic.rc)
 

code/nel/tools/misc/words_dic/version.rc2

@@ -0,0 +1,51 @@
+
+#ifndef NL_VERSION_RC2
+#define NL_VERSION_RC2
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+#pragma code_page(65001)
+
+#include <windows.h>
+#include "config.h"
+
+#ifdef _DEBUG
+#define NL_FILEEXT "_d"
+#else
+#define NL_FILEEXT ""
+#endif
+
+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_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", AUTHOR
+            VALUE "FileDescription", "NeL Words Dictionary"
+            VALUE "FileVersion", NL_VERSION
+            VALUE "LegalCopyright", COPYRIGHT
+            VALUE "OriginalFilename", "words_dic" NL_FILEEXT ".exe"
+            VALUE "ProductName", "NeL Tools"
+            VALUE "ProductVersion", NL_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x9, 1200
+    END
+END
+
+#endif /* #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) */
+#endif /* #ifndef NL_VERSION_RC2 */

code/nel/tools/misc/words_dic/words_dic.rc

@@ -13,11 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -48,52 +48,6 @@ BEGIN
 END
 
 
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Nevrax\0"
-            VALUE "FileDescription", "\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "words_dic\0"
-            VALUE "LegalCopyright", "Copyright (C) 2003\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Nevrax Words Dictionary\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -110,22 +64,7 @@ BEGIN
         BOTTOMMARGIN, 242
     END
 END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // TEXTINCLUDE
@@ -157,6 +96,8 @@ BEGIN
     "#include ""res\\words_dic.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
     "#include ""afxres.rc""         // Standard components\r\n"
     "#endif\r\n"
+    "\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
@@ -203,7 +144,7 @@ BEGIN
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // French (France) resources
+#endif    // English resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -227,6 +168,8 @@ LANGUAGE 9, 1
 #include "afxres.rc"         // Standard components
 #endif
 
+#include "version.rc2"
+
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 

code/nel/tools/misc/words_dic_qt/CMakeLists.txt

@@ -1,14 +1,13 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
-FILE(GLOB WORDS_DIC_SRC *.cpp *.h)
+FILE(GLOB WORDS_DIC_SRC *.cpp *.h *.rc *.rc2)
+
+SOURCE_GROUP("" FILES ${WORDS_DIC_SRC})
+
 SET(WORDS_DIC_HDR words_dicDlg.h)
 SET(WORDS_DIC_UIS words_dic_Qt.ui)
 SET(WORDS_DIC_RCS words_dic_Qt.qrc)
 
-IF(WIN32)
-  SET(WORDS_DIC_RC words_dic.rc)
-ENDIF()
-
 ADD_DEFINITIONS(-DNL_WORDS_DIC_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
 IF(WITH_QT)
@@ -29,7 +28,7 @@ ELSE()
   QT5_WRAP_CPP(WORDS_DIC_MOC_SRCS ${WORDS_DIC_HDR})
 ENDIF()
 
-ADD_EXECUTABLE(words_dic_qt WIN32 ${WORDS_DIC_SRC} ${WORDS_DIC_MOC_SRCS} ${WORDS_DIC_RC_SRCS} ${WORDS_DIC_UI_HDRS} ${WORDS_DIC_RC})
+ADD_EXECUTABLE(words_dic_qt WIN32 ${WORDS_DIC_SRC} ${WORDS_DIC_MOC_SRCS} ${WORDS_DIC_RC_SRCS} ${WORDS_DIC_UI_HDRS})
 
 TARGET_LINK_LIBRARIES(words_dic_qt ${QT_LIBRARIES} nelmisc)
 NL_DEFAULT_PROPS(words_dic_qt "NeL, Tools, Misc: Qt Words Dic")